Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Paul Burton <paul.burton@mips.com>
To:     "linux-mtd@lists.infradead.org" <linux-mtd@lists.infradead.org>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Paul Burton <pburton@wavecomp.com>,
        Boris Brezillon <bbrezillon@kernel.org>,
        Miquel Raynal <miquel.raynal@bootlin.com>,
        David Woodhouse <dwmw2@infradead.org>,
        Brian Norris <computersforpeace@gmail.com>,
        Marek Vasut <marek.vasut@gmail.com>,
        Vignesh Raghavendra <vigneshr@ti.com>,
        "linux-mips@vger.kernel.org" <linux-mips@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: [PATCH v2] mtd: rawnand: au1550nd: Fix au_read_buf16() prototype
Thread-Topic: [PATCH v2] mtd: rawnand: au1550nd: Fix au_read_buf16() prototype
Thread-Index: AQHVeuNWynqdjimsiEObCQj6PnemqA==
Date:   Fri, 4 Oct 2019 18:41:30 +0000
Message-ID: <20191004184115.851137-1-paul.burton@mips.com>
References: <20191004183706.850363-1-paul.burton@mips.com>
In-Reply-To: <20191004183706.850363-1-paul.burton@mips.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.23.0
x-originating-ip: [12.94.197.246]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 0ad88d19-055c-4e53-9251-08d748fa78b0
x-ms-traffictypediagnostic: MWHPR2201MB1709:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <MWHPR2201MB170998EB3CF1A199A9B0B9FBC19E0@MWHPR2201MB1709.namprd22.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:913;
x-forefront-prvs: 018093A9B5
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(39840400004)(376002)(346002)(396003)(136003)(199004)(189003)(42882007)(478600001)(26005)(2351001)(66446008)(66476007)(66946007)(66556008)(64756008)(52116002)(99286004)(6436002)(6512007)(6486002)(5640700003)(25786009)(14454004)(4326008)(1076003)(5660300002)(71200400001)(71190400001)(186003)(76176011)(446003)(386003)(8676002)(256004)(44832011)(476003)(2616005)(486006)(11346002)(14444005)(54906003)(316002)(7736002)(7416002)(305945005)(6116002)(2906002)(3846002)(81156014)(81166006)(8936002)(50226002)(6916009)(36756003)(2501003)(6506007)(102836004)(66066001)(21314003);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR2201MB1709;H:MWHPR2201MB1277.namprd22.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: wavecomp.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: jFMw5jBwYFCw5BeeYNRoS4Y0tCNmL/UP05VCBxzNynuNMQECdr0h2IAkiJpKvyH3NMPPF2xKb2QuNvRAmSKKHJv6fw+l/n+vFq3aAa1AjIaz9SCGeWJs7R85MswT6ysxZ0Ex+v4te4Ejk/TDcdyUBzdYQiYLw5hHtRnJs3Rwy2p6g+5ga7lVuDeDGemD6jy6vLlsGyUPVRp9N+P3HhB8+I4UUjEnA+LZLuZINsblfASALtH09uiGTkwMy5RlFpjdxSpVhcC3cC/trnLGSF6AWLGFD7kUDedhjgPIF4e3MiDe8+YBQtbLs6kVdrn3V12+t9t1tHBRRtwgLPTgtc4QBJhZqu7iFuyallrr1Z14MPmMDwpQM42TCD0APkacRmKNb1+27+HBBrSUpgqU7CTeRu8y8akQzHbBldTdOjFOWYM=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: mips.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ad88d19-055c-4e53-9251-08d748fa78b0
X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Oct 2019 18:41:30.3584
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 463607d3-1db3-40a0-8a29-970c56230104
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: fXSRCeS4zUZPtRApnz1Q+BewToni6J4ICPwrznc4o+vICynAIZcsRUMNRzdE5UdkSOUBzliRbHjFJ0q+ErnX7w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR2201MB1709
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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_x=
xx() 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+

---

Changes in v2:
- Update kerneldoc comment too...

 drivers/mtd/nand/raw/au1550nd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/au1550nd.c b/drivers/mtd/nand/raw/au1550n=
d.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, co=
nst u_char *buf, int len)
=20
 /**
  * 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 =3D mtd_to_nand(mtd);
 	u16 *p =3D (u16 *) buf;
 	len >>=3D 1;
=20
--=20
2.23.0