Unverified Commit 1e0cc8d0 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files

spi: switch to use spi_controller_is_target() 



Switch to use modern name function spi_controller_is_target().

No functional changed.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://patch.msgid.link/20240910022618.1397-2-yangyingliang@huaweicloud.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9228956a

drivers/spi/spi.c

+4 −4
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ static int spi_transfer_wait(struct spi_controller *ctlr, 
	u32 speed_hz = xfer->speed_hz;

	unsigned long long ms;



	if (spi_controller_is_slave(ctlr)) {

	if (spi_controller_is_target(ctlr)) {

		if (wait_for_completion_interruptible(&ctlr->xfer_completion)) {

			dev_dbg(&msg->spi->dev, "SPI transfer interrupted\n");

			return -EINTR;
@@ -2425,7 +2425,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, 
		}

	}



	if (spi_controller_is_slave(ctlr)) {

	if (spi_controller_is_target(ctlr)) {

		if (!of_node_name_eq(nc, "slave")) {

			dev_err(&ctlr->dev, "%pOF is not called 'slave'\n",

				nc);
@@ -3321,7 +3321,7 @@ int spi_register_controller(struct spi_controller *ctlr) 
	 */

	dev_set_name(&ctlr->dev, "spi%u", ctlr->bus_num);



	if (!spi_controller_is_slave(ctlr) && ctlr->use_gpio_descriptors) {

	if (!spi_controller_is_target(ctlr) && ctlr->use_gpio_descriptors) {

		status = spi_get_gpio_descs(ctlr);

		if (status)

			goto free_bus_id;
@@ -3349,7 +3349,7 @@ int spi_register_controller(struct spi_controller *ctlr) 
	if (status < 0)

		goto free_bus_id;

	dev_dbg(dev, "registered %s %s\n",

			spi_controller_is_slave(ctlr) ? "slave" : "master",

			spi_controller_is_target(ctlr) ? "target" : "host",

			dev_name(&ctlr->dev));



	/*