From: Mark Brown <broonie@kernel.org>
Date: Mon, 7 Aug 2023 20:59:25 +0000 (+0100)
Subject: spi: switch to use modern name
X-Git-Tag: v6.6-rc1~167^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9a798867b15b906aa0637d8efb8f6d7ed188291;p=thirdparty%2Flinux.git

spi: switch to use modern name

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.
---

f9a798867b15b906aa0637d8efb8f6d7ed188291
diff --cc drivers/spi/spi-cadence.c
index 7b0136536cfb7,2554d06a650c6..3c9813ad064bc
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@@ -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;
  	}