]> www.infradead.org Git - linux.git/commitdiff
spi: switch to use spi_controller_is_target()
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 10 Sep 2024 02:26:11 +0000 (10:26 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 10 Sep 2024 11:41:36 +0000 (12:41 +0100)
Switch to use modern name function spi_controller_is_target().

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://patch.msgid.link/20240910022618.1397-2-yangyingliang@huaweicloud.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi.c

index 60a2b5a0c85dcb0ed70438b3599db35582c63bfa..ea14c33bc83159e704040209137c405f035f8298 100644 (file)
@@ -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));
 
        /*