]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
spi: spidev: Follow renaming of SPI "master" to "controller"
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 7 Feb 2024 18:40:37 +0000 (19:40 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 8 Feb 2024 11:54:53 +0000 (11:54 +0000)
In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"")
some functions and struct members were renamed. To not break all drivers
compatibility macros were provided.

To be able to remove these compatibility macros push the renaming into
this driver.

Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/15ebfdf58a6590962bdd51b49b2e85a69b3bf443.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spidev.c

index 655f2c959cd4cabf465ff18df71ed413064d1f89..95fb5f1c91c176099005f2dfdc7cdc3425be92a7 100644 (file)
@@ -802,7 +802,7 @@ static int spidev_probe(struct spi_device *spi)
                spidev->devt = MKDEV(SPIDEV_MAJOR, minor);
                dev = device_create(&spidev_class, &spi->dev, spidev->devt,
                                    spidev, "spidev%d.%d",
-                                   spi->master->bus_num, spi_get_chipselect(spi, 0));
+                                   spi->controller->bus_num, spi_get_chipselect(spi, 0));
                status = PTR_ERR_OR_ZERO(dev);
        } else {
                dev_dbg(&spi->dev, "no minor number available!\n");