Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c7d7875 authored by Brian Norris's avatar Brian Norris
Browse files

mtd: spi-nor: convert to spi_nor_{get, set}_flash_node() 



Used semantic patch with 'make coccicheck MODE=patch COCCI=script.cocci':

---8<----
virtual patch

@@
struct spi_nor b;
struct spi_nor *c;
expression d;
@@
(
-(b).flash_node = (d)
+spi_nor_set_flash_node(&b, d)
|
-(c)->flash_node = (d)
+spi_nor_set_flash_node(c, d)
)
---8<----

And a manual conversion for the one use of spi_nor_get_flash_node().

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 63752199

drivers/mtd/devices/m25p80.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int m25p_probe(struct spi_device *spi) 
	nor->read_reg = m25p80_read_reg;



	nor->dev = &spi->dev;

	nor->flash_node = spi->dev.of_node;

	spi_nor_set_flash_node(nor, spi->dev.of_node);

	nor->priv = flash;



	spi_set_drvdata(spi, flash);

drivers/mtd/spi-nor/fsl-quadspi.c

+1 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ static int fsl_qspi_probe(struct platform_device *pdev) 
		mtd = &nor->mtd;



		nor->dev = dev;

		nor->flash_node = np;

		spi_nor_set_flash_node(nor, np);

		nor->priv = q;



		/* fill the hooks */

drivers/mtd/spi-nor/nxp-spifi.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi, 
	writel(ctrl, spifi->io_base + SPIFI_CTRL);



	spifi->nor.dev   = spifi->dev;

	spifi->nor.flash_node = np;

	spi_nor_set_flash_node(&spifi->nor, np);

	spifi->nor.priv  = spifi;

	spifi->nor.read  = nxp_spifi_read;

	spifi->nor.write = nxp_spifi_write;

drivers/mtd/spi-nor/spi-nor.c

+1 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) 
	const struct flash_info *info = NULL;

	struct device *dev = nor->dev;

	struct mtd_info *mtd = &nor->mtd;

	struct device_node *np = nor->flash_node;

	struct device_node *np = spi_nor_get_flash_node(nor);

	int ret;

	int i;