| From 173e44f5477d5ba9260c4a14cc7d622eb2372708 Mon Sep 17 00:00:00 2001 |
| From: Paul Burton <paul.burton@mips.com> |
| Date: Fri, 4 Oct 2019 18:41:30 +0000 |
| Subject: [PATCH] mtd: rawnand: au1550nd: Fix au_read_buf16() prototype |
| |
| commit df8fed831cbcdce7b283b2d9c1aadadcf8940d05 upstream. |
| |
| 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: stable@vger.kernel.org # v4.20+ |
| Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/mtd/nand/raw/au1550nd.c b/drivers/mtd/nand/raw/au1550nd.c |
| index 97a97a9ccc36..e10b76089048 100644 |
| --- a/drivers/mtd/nand/raw/au1550nd.c |
| +++ b/drivers/mtd/nand/raw/au1550nd.c |
| @@ -134,16 +134,15 @@ static void au_write_buf16(struct nand_chip *this, const u_char *buf, int len) |
| |
| /** |
| * au_read_buf16 - read chip data into buffer |
| - * @mtd: MTD device structure |
| + * @this: NAND chip object |
| * @buf: buffer to store date |
| * @len: number of bytes to read |
| * |
| * 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; |
| |
| -- |
| 2.7.4 |
| |
