| Message ID | 1397638079-1894-1-git-send-email-computersforpeace@gmail.com |
|---|---|
| State | Accepted |
| Commit | a965d04c977096ff91f12f96eb7b35b7b03af48c |
| Headers | show |
于 2014年04月16日 16:47, 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 <computersforpeace@gmail.com> > --- > 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(-) > > diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c > index b41bbbc531ff..8d659a2888d5 100644 > --- a/drivers/mtd/spi-nor/fsl-quadspi.c > +++ b/drivers/mtd/spi-nor/fsl-quadspi.c > @@ -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; Acked-by: Huang Shijie <b32955@freescale.com>
On Wed, Apr 16, 2014 at 04:54:00PM +0800, Huang Shijie wrote: > 于 2014年04月16日 16:47, 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 <computersforpeace@gmail.com> > > --- > > Branched off of a previous patch series, but dropped the memcpy() stuff for now > > > Acked-by: Huang Shijie <b32955@freescale.com> Pushed to l2-mtd.git/spinor. Brian
于 2014年04月16日 17:15, 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
On Wed, Apr 16, 2014 at 05:21:43PM +0800, Huang Shijie wrote: > 于 2014年04月16日 17:15, 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. > 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
diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index b41bbbc531ff..8d659a2888d5 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -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;
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 <computersforpeace@gmail.com> --- 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(-)