From nobody Mon Feb 9 13:01:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 366A4C7EE22 for ; Sun, 14 May 2023 09:46:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235765AbjENJqt (ORCPT ); Sun, 14 May 2023 05:46:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235589AbjENJqm (ORCPT ); Sun, 14 May 2023 05:46:42 -0400 X-Greylist: delayed 398 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 14 May 2023 02:46:22 PDT Received: from mx3.wp.pl (mx3.wp.pl [212.77.101.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5EE91FDF for ; Sun, 14 May 2023 02:46:22 -0700 (PDT) Received: (wp-smtpd smtp.wp.pl 30791 invoked from network); 14 May 2023 11:39:40 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=1024a; t=1684057180; bh=9X4Aik96rC7qqmmYlE08FycZCCqFGLDNGNT88xeEStE=; h=From:To:Subject; b=eUjJuTeuXiTtdiQAQRm0+804WnQu0nvGYlwfsE3Yr12gCluTBDVQHs3ofLEFeDYqk hOINnJAmPIYXo2skqjhvvYdYeXnjwrTiw93hRjhuFKNWfnURv7BHiY9mwmXBANUI3d TVceNRWDaGk88xylTqIiAT/bPC9SbBkYurMp8fck= Received: from 79.184.247.17.ipv4.supernova.orange.pl (HELO LAPTOP-OLEK.home) (olek2@wp.pl@[79.184.247.17]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 14 May 2023 11:39:40 +0200 From: Aleksander Jan Bajkowski To: miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, olek2@wp.pl, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] mtd: cfi_cmdset_0001: Disable write buffer functions if FORCE_WORD_WRITE is 1 Date: Sun, 14 May 2023 11:39:35 +0200 Message-Id: <20230514093935.4679-1-olek2@wp.pl> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-WP-MailID: 4044979a10be0e33303665ee941e3f2b X-WP-AV: skaner antywirusowy Poczty Wirtualnej Polski X-WP-SPAM: NO 000000A [QdPk] Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some write buffer functions are not used when FORCE_WORD_WRITE is set to 1. So the compile warning messages are output if FORCE_WORD_WRITE is 1. To resolve this disable the write buffer functions if FORCE_WORD_WRITE is 1. This is similar fix to: 557c759036fc3976a5358cef23e65a263853b93f. Signed-off-by: Aleksander Jan Bajkowski --- drivers/mtd/chips/cfi_cmdset_0001.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cm= dset_0001.c index 54f92d09d9cf..8f7223221db2 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -61,8 +61,10 @@ =20 static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *,= u_char *); static int cfi_intelext_write_words(struct mtd_info *, loff_t, size_t, siz= e_t *, const u_char *); +#if !FORCE_WORD_WRITE static int cfi_intelext_write_buffers(struct mtd_info *, loff_t, size_t, s= ize_t *, const u_char *); static int cfi_intelext_writev(struct mtd_info *, const struct kvec *, uns= igned long, loff_t, size_t *); +#endif static int cfi_intelext_erase_varsize(struct mtd_info *, struct erase_info= *); static void cfi_intelext_sync (struct mtd_info *); static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, uint64_t le= n); @@ -304,6 +306,7 @@ static void fixup_use_point(struct mtd_info *mtd) } } =20 +#if !FORCE_WORD_WRITE static void fixup_use_write_buffers(struct mtd_info *mtd) { struct map_info *map =3D mtd->priv; @@ -314,6 +317,7 @@ static void fixup_use_write_buffers(struct mtd_info *mt= d) mtd->_writev =3D cfi_intelext_writev; } } +#endif /* !FORCE_WORD_WRITE */ =20 /* * Some chips power-up with all sectors locked by default. @@ -1703,6 +1707,7 @@ static int cfi_intelext_write_words (struct mtd_info = *mtd, loff_t to , size_t le } =20 =20 +#if !FORCE_WORD_WRITE static int __xipram do_write_buffer(struct map_info *map, struct flchip *c= hip, unsigned long adr, const struct kvec **pvec, unsigned long *pvec_seek, int len) @@ -1931,6 +1936,7 @@ static int cfi_intelext_write_buffers (struct mtd_inf= o *mtd, loff_t to, =20 return cfi_intelext_writev(mtd, &vec, 1, to, retlen); } +#endif /* !FORCE_WORD_WRITE */ =20 static int __xipram do_erase_oneblock(struct map_info *map, struct flchip = *chip, unsigned long adr, int len, void *thunk) --=20 2.30.2