diff options
author | Brian Norris <computersforpeace@gmail.com> | 2015-10-30 23:33:24 -0400 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2015-11-11 16:45:24 -0500 |
commit | 9c7d787508be6d68a6ec66de3c3466b24e820c71 (patch) | |
tree | 7db5e704ed639dced7e27bb36dd1e624c95e5ef5 | |
parent | 6375219951a66047805ed977b674615d152001ee (diff) |
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: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-rw-r--r-- | drivers/mtd/devices/m25p80.c | 2 | ||||
-rw-r--r-- | drivers/mtd/spi-nor/fsl-quadspi.c | 2 | ||||
-rw-r--r-- | drivers/mtd/spi-nor/nxp-spifi.c | 2 | ||||
-rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 4b5d7a4655fd..556b4554007f 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
@@ -199,7 +199,7 @@ static int m25p_probe(struct spi_device *spi) | |||
199 | nor->read_reg = m25p80_read_reg; | 199 | nor->read_reg = m25p80_read_reg; |
200 | 200 | ||
201 | nor->dev = &spi->dev; | 201 | nor->dev = &spi->dev; |
202 | nor->flash_node = spi->dev.of_node; | 202 | spi_nor_set_flash_node(nor, spi->dev.of_node); |
203 | nor->priv = flash; | 203 | nor->priv = flash; |
204 | 204 | ||
205 | spi_set_drvdata(spi, flash); | 205 | spi_set_drvdata(spi, flash); |
diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index 7b10ed413983..8f4d9204d2b2 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c | |||
@@ -1013,7 +1013,7 @@ static int fsl_qspi_probe(struct platform_device *pdev) | |||
1013 | mtd = &nor->mtd; | 1013 | mtd = &nor->mtd; |
1014 | 1014 | ||
1015 | nor->dev = dev; | 1015 | nor->dev = dev; |
1016 | nor->flash_node = np; | 1016 | spi_nor_set_flash_node(nor, np); |
1017 | nor->priv = q; | 1017 | nor->priv = q; |
1018 | 1018 | ||
1019 | /* fill the hooks */ | 1019 | /* fill the hooks */ |
diff --git a/drivers/mtd/spi-nor/nxp-spifi.c b/drivers/mtd/spi-nor/nxp-spifi.c index 9e82098ae644..4524b2886946 100644 --- a/drivers/mtd/spi-nor/nxp-spifi.c +++ b/drivers/mtd/spi-nor/nxp-spifi.c | |||
@@ -330,7 +330,7 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi, | |||
330 | writel(ctrl, spifi->io_base + SPIFI_CTRL); | 330 | writel(ctrl, spifi->io_base + SPIFI_CTRL); |
331 | 331 | ||
332 | spifi->nor.dev = spifi->dev; | 332 | spifi->nor.dev = spifi->dev; |
333 | spifi->nor.flash_node = np; | 333 | spi_nor_set_flash_node(&spifi->nor, np); |
334 | spifi->nor.priv = spifi; | 334 | spifi->nor.priv = spifi; |
335 | spifi->nor.read = nxp_spifi_read; | 335 | spifi->nor.read = nxp_spifi_read; |
336 | spifi->nor.write = nxp_spifi_write; | 336 | spifi->nor.write = nxp_spifi_write; |
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 1d3107ccee61..924d455dadb5 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c | |||
@@ -1151,7 +1151,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) | |||
1151 | const struct flash_info *info = NULL; | 1151 | const struct flash_info *info = NULL; |
1152 | struct device *dev = nor->dev; | 1152 | struct device *dev = nor->dev; |
1153 | struct mtd_info *mtd = &nor->mtd; | 1153 | struct mtd_info *mtd = &nor->mtd; |
1154 | struct device_node *np = nor->flash_node; | 1154 | struct device_node *np = spi_nor_get_flash_node(nor); |
1155 | int ret; | 1155 | int ret; |
1156 | int i; | 1156 | int i; |
1157 | 1157 | ||