| Message ID | 20191004183706.850363-1-paul.burton@mips.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mtd: rawnand: au1550nd: Fix au_read_buf16() prototype | expand |
On Fri, 4 Oct 2019 18:38:33 +0000 Paul Burton <paul.burton@mips.com> wrote: > Commit 7e534323c416 ("mtd: rawnand: Pass a nand_chip object to > chip->read_xxx() hooks") modified the prototype of the struct nand_chip > read_buf function pointer. In the au1550nd driver we have 2 > implementations of read_buf. The previously mentioned commit modified > the au_read_buf() implementation to match the function pointer, but not > au_read_buf16(). This results in a compiler warning for MIPS > db1xxx_defconfig builds: > > drivers/mtd/nand/raw/au1550nd.c:443:57: > warning: pointer type mismatch in conditional expression > > Fix this by updating the prototype of au_read_buf16() to take a struct > nand_chip pointer as its first argument, as is expected after commit > 7e534323c416 ("mtd: rawnand: Pass a nand_chip object to chip->read_xxx() > hooks"). > > Note that this shouldn't have caused any functional issues at runtime, > since the offset of the struct mtd_info within struct nand_chip is 0 > making mtd_to_nand() effectively a type-cast. > > Signed-off-by: Paul Burton <paul.burton@mips.com> > Fixes: 7e534323c416 ("mtd: rawnand: Pass a nand_chip object to chip->read_xxx() hooks") > Cc: Boris Brezillon <bbrezillon@kernel.org> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > Cc: Miquel Raynal <miquel.raynal@bootlin.com> > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: Brian Norris <computersforpeace@gmail.com> > Cc: Marek Vasut <marek.vasut@gmail.com> > Cc: Vignesh Raghavendra <vigneshr@ti.com> > Cc: linux-mtd@lists.infradead.org > Cc: linux-mips@vger.kernel.org > Cc: stable@vger.kernel.org # v4.20+ > > --- > > drivers/mtd/nand/raw/au1550nd.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/mtd/nand/raw/au1550nd.c b/drivers/mtd/nand/raw/au1550nd.c > index 97a97a9ccc36..2bc818dea2a8 100644 > --- a/drivers/mtd/nand/raw/au1550nd.c > +++ b/drivers/mtd/nand/raw/au1550nd.c > @@ -140,10 +140,9 @@ static void au_write_buf16(struct nand_chip *this, const u_char *buf, int len) > * > * read function for 16bit buswidth > */ > -static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len) > +static void au_read_buf16(struct nand_chip *this, u_char *buf, int len) > { > int i; > - struct nand_chip *this = mtd_to_nand(mtd); > u16 *p = (u16 *) buf; > len >>= 1; >
diff --git a/drivers/mtd/nand/raw/au1550nd.c b/drivers/mtd/nand/raw/au1550nd.c index 97a97a9ccc36..2bc818dea2a8 100644 --- a/drivers/mtd/nand/raw/au1550nd.c +++ b/drivers/mtd/nand/raw/au1550nd.c @@ -140,10 +140,9 @@ static void au_write_buf16(struct nand_chip *this, const u_char *buf, int len) * * read function for 16bit buswidth */ -static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len) +static void au_read_buf16(struct nand_chip *this, u_char *buf, int len) { int i; - struct nand_chip *this = mtd_to_nand(mtd); u16 *p = (u16 *) buf; len >>= 1;
Commit 7e534323c416 ("mtd: rawnand: Pass a nand_chip object to chip->read_xxx() hooks") modified the prototype of the struct nand_chip read_buf function pointer. In the au1550nd driver we have 2 implementations of read_buf. The previously mentioned commit modified the au_read_buf() implementation to match the function pointer, but not au_read_buf16(). This results in a compiler warning for MIPS db1xxx_defconfig builds: drivers/mtd/nand/raw/au1550nd.c:443:57: warning: pointer type mismatch in conditional expression Fix this by updating the prototype of au_read_buf16() to take a struct nand_chip pointer as its first argument, as is expected after commit 7e534323c416 ("mtd: rawnand: Pass a nand_chip object to chip->read_xxx() hooks"). Note that this shouldn't have caused any functional issues at runtime, since the offset of the struct mtd_info within struct nand_chip is 0 making mtd_to_nand() effectively a type-cast. Signed-off-by: Paul Burton <paul.burton@mips.com> Fixes: 7e534323c416 ("mtd: rawnand: Pass a nand_chip object to chip->read_xxx() hooks") Cc: Boris Brezillon <bbrezillon@kernel.org> Cc: Miquel Raynal <miquel.raynal@bootlin.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Vignesh Raghavendra <vigneshr@ti.com> Cc: linux-mtd@lists.infradead.org Cc: linux-mips@vger.kernel.org Cc: stable@vger.kernel.org # v4.20+ --- drivers/mtd/nand/raw/au1550nd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)