Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1259928

[PATCH v2 05/11] mtd: spi-nor: convert to spi_nor_{get,set}_flash_node()

From Brian Norris <computersforpeace@gmail.com>
Newsgroups linux.kernel
Subject [PATCH v2 05/11] mtd: spi-nor: convert to spi_nor_{get,set}_flash_node()
Date 2015-10-31 04:40 +0100
Message-ID <qpvbk-69C-33@gated-at.bofh.it> (permalink)
References <qpvbj-69C-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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>
---
v2: new

 drivers/mtd/devices/m25p80.c      | 2 +-
 drivers/mtd/spi-nor/fsl-quadspi.c | 2 +-
 drivers/mtd/spi-nor/nxp-spifi.c   | 2 +-
 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)
 	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);
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)
 		mtd = &nor->mtd;
 
 		nor->dev = dev;
-		nor->flash_node = np;
+		spi_nor_set_flash_node(nor, np);
 		nor->priv = q;
 
 		/* 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,
 	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;
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)
 	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;
 
-- 
2.6.0.rc2.230.g3dd15c0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v2 00/11] mtd: migrate 'of_node' handling to core, not in mtd_part_parser_data Brian Norris <computersforpeace@gmail.com> - 2015-10-31 04:40 +0100
  [PATCH v2 05/11] mtd: spi-nor: convert to spi_nor_{get,set}_flash_node() Brian Norris <computersforpeace@gmail.com> - 2015-10-31 04:40 +0100
  [PATCH v2 06/11] mtd: nand: drop unnecessary partition parser data Brian Norris <computersforpeace@gmail.com> - 2015-10-31 04:40 +0100
    Re: [PATCH v2 06/11] mtd: nand: drop unnecessary partition parser  data Boris Brezillon <boris.brezillon@free-electrons.com> - 2015-11-01 23:40 +0100
      Re: [PATCH v2 06/11] mtd: nand: drop unnecessary partition parser  data Brian Norris <computersforpeace@gmail.com> - 2015-11-02 22:10 +0100
        Re: [PATCH v2 06/11] mtd: nand: drop unnecessary partition parser  data Brian Norris <computersforpeace@gmail.com> - 2015-11-12 00:50 +0100
  Re: [PATCH v2 00/11] mtd: migrate 'of_node' handling to core, not  in mtd_part_parser_data Boris Brezillon <boris.brezillon@free-electrons.com> - 2015-11-01 09:10 +0100
  [PATCH v2 12/11] mtd: nand: convert to nand_get_flash_node() Boris Brezillon <boris.brezillon@free-electrons.com> - 2015-11-02 00:10 +0100
    Re: [PATCH v2 12/11] mtd: nand: convert to nand_get_flash_node() Brian Norris <computersforpeace@gmail.com> - 2015-11-12 01:00 +0100
  [PATCH v2 13/11] mtd: assign mtd->dev.of_node when creating partition devices Boris Brezillon <boris.brezillon@free-electrons.com> - 2015-11-02 01:40 +0100
    Re: [PATCH v2 13/11] mtd: assign mtd->dev.of_node when creating  partition devices Brian Norris <computersforpeace@gmail.com> - 2015-11-12 01:20 +0100
      Re: [PATCH v2 13/11] mtd: assign mtd->dev.of_node when creating  partition devices Boris Brezillon <boris.brezillon@free-electrons.com> - 2015-11-12 14:30 +0100

csiph-web