spi: switch to use modern name
authorMark Brown <broonie@kernel.org>
Mon, 7 Aug 2023 20:59:25 +0000 (21:59 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 7 Aug 2023 20:59:25 +0000 (21:59 +0100)
Merge series from Yang Yingliang <yangyingliang@huawei.com>:

After introducing devm_spi_alloc_host/spi_alloc_host(), the legacy
named function devm_spi_alloc_master/spi_alloc_master() can be replaced.
And also change other legacy name master/slave to modern name host/target
or controller.

1  2 
drivers/spi/spi-axi-spi-engine.c
drivers/spi/spi-bcm2835.c
drivers/spi/spi-bcm2835aux.c
drivers/spi/spi-cadence.c

Simple merge
Simple merge
Simple merge
index 7b0136536cfb7d300e9aba2538c77f4621dee0f5,2554d06a650c6678ae35e86289ad6654b99a9b5e..3c9813ad064bc712143b9c8cfab716a5ae1b8c77
@@@ -624,11 -624,11 +624,11 @@@ static int cdns_spi_probe(struct platfo
        cdns_spi_detect_fifo_depth(xspi);
  
        /* SPI controller initializations */
-       cdns_spi_init_hw(xspi, spi_controller_is_slave(ctlr));
+       cdns_spi_init_hw(xspi, spi_controller_is_target(ctlr));
  
        irq = platform_get_irq(pdev, 0);
 -      if (irq <= 0) {
 -              ret = -ENXIO;
 +      if (irq < 0) {
 +              ret = irq;
                goto clk_dis_all;
        }