Skip to contentSkip to conversation

mtd: fsl-quadspi: fix __iomem annotations

PATCH In review Brian Norris 2 participants 5 messages Apr 16, 2014 – Apr 17, 2014

Subsystems (2)
Memory technology devices (MTD) SPI NOR
lore
Share & tools
lore

Brian Norris

author
#0 lore raw

PATCH 1/1 mtd: fsl-quadspi: fix __iomem annotations

This corrects some sparse warnings:

drivers/mtd/spi-nor/fsl-quadspi.c:281:31: warning: incorrect type in initializer (different address spaces) [sparse]
drivers/mtd/spi-nor/fsl-quadspi.c:281:31: expected void *[noderef] <asn:2>base [sparse]
drivers/mtd/spi-nor/fsl-quadspi.c:281:31: got void [noderef] <asn:2>*iobase [sparse]
(etc.)

Signed-off-by Brian Norris <[email protected]>

---
Branched off of a previous patch series, but dropped the memcpy() stuff for now

 drivers/mtd/spi-nor/fsl-quadspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/spi-nor/fsl-quadspi.c +2 -2
index b41bbbc531ff..8d659a2888d5 100644
@@ -278,7 +278,7 @@ static irqreturn_t fsl_qspi_irq_handler(int irq, void *dev_id)
 
 static void fsl_qspi_init_lut(struct fsl_qspi *q)
 {
-	void *__iomem base = q->iobase;
+	void __iomem *base = q->iobase;
 	int rxfifo = q->devtype_data->rxfifo;
 	u32 lut_base;
 	u8 cmd, addrlen, dummy;

@@ -422,7 +422,7 @@ static int fsl_qspi_get_seqid(struct fsl_qspi *q, u8 cmd)
 static int
 fsl_qspi_runcmd(struct fsl_qspi *q, u8 cmd, unsigned int addr, int len)
 {
-	void *__iomem base = q->iobase;
+	void __iomem *base = q->iobase;
 	int seqid;
 	u32 reg, reg2;
 	int err;
Signature · 1 line
1.8.3.2
Acked-by on v1 1/1
#1 lore raw
Quoted 28 lines · Brian Norris

This corrects some sparse warnings:

   drivers/mtd/spi-nor/fsl-quadspi.c:281:31: warning: incorrect type in initializer (different address spaces) [sparse]
   drivers/mtd/spi-nor/fsl-quadspi.c:281:31:    expected void *[noderef] <asn:2>base [sparse]
   drivers/mtd/spi-nor/fsl-quadspi.c:281:31:    got void [noderef] <asn:2>*iobase [sparse]
   (etc.)
Signed-off-by Brian Norris <[email protected]>

---
Branched off of a previous patch series, but dropped the memcpy() stuff for now

 drivers/mtd/spi-nor/fsl-quadspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/spi-nor/fsl-quadspi.c +1 -1
index b41bbbc531ff..8d659a2888d5 100644
@@ -278,7 +278,7 @@ static irqreturn_t fsl_qspi_irq_handler(int irq, void *dev_id)
 
 static void fsl_qspi_init_lut(struct fsl_qspi *q)
 {
-	void *__iomem base = q->iobase;
+	void __iomem *base = q->iobase;
 	int rxfifo = q->devtype_data->rxfifo;
 	u32 lut_base;
 	u8 cmd, addrlen, dummy;

drivers/mtd/spi-nor/fsl-quadspi.c static int fsl_qspi_get_seqid(struct fsl_qspi *q, u8 cmd) · line 428

Quoted 8 lines
drivers/mtd/spi-nor/fsl-quadspi.c +1 -1
@@ -422,7 +422,7 @@ static int fsl_qspi_get_seqid(struct fsl_qspi *q, u8 cmd)
 static int
 fsl_qspi_runcmd(struct fsl_qspi *q, u8 cmd, unsigned int addr, int len)
 {
-	void *__iomem base = q->iobase;
+	void __iomem *base = q->iobase;
 	int seqid;
 	u32 reg, reg2;
 	int err;
Acked-by Huang Shijie <[email protected]>
author Applied
#2 lore raw
Quoted 8 lines · Huang Shijie
Quoted 7 lines · Brian Norris

This corrects some sparse warnings:

   drivers/mtd/spi-nor/fsl-quadspi.c:281:31: warning: incorrect type in initializer (different address spaces) [sparse]
   drivers/mtd/spi-nor/fsl-quadspi.c:281:31:    expected void *[noderef] <asn:2>base [sparse]
   drivers/mtd/spi-nor/fsl-quadspi.c:281:31:    got void [noderef] <asn:2>*iobase [sparse]
   (etc.)
Quoted 5 lines
Quoted 4 lines
Signed-off-by Brian Norris <[email protected]>

---
Branched off of a previous patch series, but dropped the memcpy() stuff for now

Acked-by Huang Shijie <[email protected]>

Pushed to l2-mtd.git/spinor.

Brian

#3 lore raw
Quoted 1 line · Brian Norris

Pushed to l2-mtd.git/spinor.

I think you can rebase patches in the spinor branch to the master branch now.

After the rebase, we can add the patch for the *defconfig for the linux-next.

thanks
Huang Shijie

author
#4 lore raw
Quoted 4 lines · Huang Shijie
Quoted 1 line · Brian Norris

Pushed to l2-mtd.git/spinor.

I think you can rebase patches in the spinor branch to the master branch now.

I merged spinor into master for now, so it will be in -next. I think I'll keep the separate branch, in case we need something stable for others to pull in.

Quoted 2 lines

After the rebase, we can add the patch for the *defconfig for the linux-next.

Yeah, I guess we should send patches. I'll try to do that soon.

Brian