Skip to content

Commit 1e0cc8d

Browse files
Yang Yingliangbroonie
authored andcommitted
spi: switch to use spi_controller_is_target()
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>
1 parent 9228956 commit 1e0cc8d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/spi/spi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ static int spi_transfer_wait(struct spi_controller *ctlr,
14401440
u32 speed_hz = xfer->speed_hz;
14411441
unsigned long long ms;
14421442

1443-
if (spi_controller_is_slave(ctlr)) {
1443+
if (spi_controller_is_target(ctlr)) {
14441444
if (wait_for_completion_interruptible(&ctlr->xfer_completion)) {
14451445
dev_dbg(&msg->spi->dev, "SPI transfer interrupted\n");
14461446
return -EINTR;
@@ -2425,7 +2425,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
24252425
}
24262426
}
24272427

2428-
if (spi_controller_is_slave(ctlr)) {
2428+
if (spi_controller_is_target(ctlr)) {
24292429
if (!of_node_name_eq(nc, "slave")) {
24302430
dev_err(&ctlr->dev, "%pOF is not called 'slave'\n",
24312431
nc);
@@ -3321,7 +3321,7 @@ int spi_register_controller(struct spi_controller *ctlr)
33213321
*/
33223322
dev_set_name(&ctlr->dev, "spi%u", ctlr->bus_num);
33233323

3324-
if (!spi_controller_is_slave(ctlr) && ctlr->use_gpio_descriptors) {
3324+
if (!spi_controller_is_target(ctlr) && ctlr->use_gpio_descriptors) {
33253325
status = spi_get_gpio_descs(ctlr);
33263326
if (status)
33273327
goto free_bus_id;
@@ -3349,7 +3349,7 @@ int spi_register_controller(struct spi_controller *ctlr)
33493349
if (status < 0)
33503350
goto free_bus_id;
33513351
dev_dbg(dev, "registered %s %s\n",
3352-
spi_controller_is_slave(ctlr) ? "slave" : "master",
3352+
spi_controller_is_target(ctlr) ? "target" : "host",
33533353
dev_name(&ctlr->dev));
33543354

33553355
/*

0 commit comments

Comments
 (0)