2024-01-22 18:41:55

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH v2 12/33] mtd: dataflash: Follow renaming of SPI "master" to "controller"

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.

Signed-off-by: Uwe Kleine-König <[email protected]>
---
drivers/mtd/devices/mtd_dataflash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 0c1b93303618..ec52277e3dd5 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -638,7 +638,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,

/* name must be usable with cmdlinepart */
sprintf(priv->name, "spi%d.%d-%s",
- spi->master->bus_num, spi_get_chipselect(spi, 0),
+ spi->controller->bus_num, spi_get_chipselect(spi, 0),
name);

device = &priv->mtd;
--
2.43.0



2024-01-22 18:57:51

by Miquel Raynal

[permalink] [raw]
Subject: Re: [PATCH v2 12/33] mtd: dataflash: Follow renaming of SPI "master" to "controller"

Hi Uwe,

[email protected] wrote on Mon, 22 Jan 2024 19:07:07 +0100:

> 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.
>
> Signed-off-by: Uwe Kleine-König <[email protected]>

I think I read in the previous thread that Mark would apply them all
through his tree, I am fine with that so here is my Acked-by. In case I
misunderstood the thread or at the end you/Mark prefer to let the
patches go through the trees they normally belong to, just let me know.

Acked-by: Miquel Raynal <[email protected]>

Thanks,
Miquèl