From: Arnd Bergmann <arnd@kernel.org>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Tokunori Ikegami <ikegami.t@gmail.com>,
Lee Jones <lee.jones@linaro.org>,
Mauro Lima <mauro.lima@eclypsium.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Boris Brezillon <boris.brezillon@collabora.com>,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] mtd: cfi: allow building spi-intel standalone
Date: Thu, 15 Dec 2022 17:39:38 +0100 [thread overview]
Message-ID: <20221215163950.649791-1-arnd@kernel.org> (raw)
From: Arnd Bergmann <arnd@arndb.de>
When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver
fails to build, as it includes the shared CFI header:
include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.
Use an #ifdef here to guard the settings so the header can be included
in all configurations.
Fixes: e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
include/linux/mtd/cfi.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index d88bb56c18e2..0e87b6e2faad 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -15,6 +15,7 @@
#include <linux/mtd/cfi_endian.h>
#include <linux/mtd/xip.h>
+#if IS_ENABLED(CONFIG_MTD)
#ifdef CONFIG_MTD_CFI_I1
#define cfi_interleave(cfi) 1
#define cfi_interleave_is_1(cfi) (cfi_interleave(cfi) == 1)
@@ -88,7 +89,7 @@ static inline int cfi_interleave_supported(int i)
return 0;
}
}
-
+#endif
/* NB: these values must represents the number of bytes needed to meet the
* device type (x8, x16, x32). Eg. a 32 bit device is 4 x 8 bytes.
--
2.35.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@kernel.org>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Tokunori Ikegami <ikegami.t@gmail.com>,
Lee Jones <lee.jones@linaro.org>,
Mauro Lima <mauro.lima@eclypsium.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Boris Brezillon <boris.brezillon@collabora.com>,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] mtd: cfi: allow building spi-intel standalone
Date: Thu, 15 Dec 2022 17:39:38 +0100 [thread overview]
Message-ID: <20221215163950.649791-1-arnd@kernel.org> (raw)
From: Arnd Bergmann <arnd@arndb.de>
When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver
fails to build, as it includes the shared CFI header:
include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.
Use an #ifdef here to guard the settings so the header can be included
in all configurations.
Fixes: e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
include/linux/mtd/cfi.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index d88bb56c18e2..0e87b6e2faad 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -15,6 +15,7 @@
#include <linux/mtd/cfi_endian.h>
#include <linux/mtd/xip.h>
+#if IS_ENABLED(CONFIG_MTD)
#ifdef CONFIG_MTD_CFI_I1
#define cfi_interleave(cfi) 1
#define cfi_interleave_is_1(cfi) (cfi_interleave(cfi) == 1)
@@ -88,7 +89,7 @@ static inline int cfi_interleave_supported(int i)
return 0;
}
}
-
+#endif
/* NB: these values must represents the number of bytes needed to meet the
* device type (x8, x16, x32). Eg. a 32 bit device is 4 x 8 bytes.
--
2.35.1
next reply other threads:[~2022-12-15 16:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 16:39 Arnd Bergmann [this message]
2022-12-15 16:39 ` [PATCH] mtd: cfi: allow building spi-intel standalone Arnd Bergmann
2022-12-16 6:36 ` Mika Westerberg
2022-12-16 6:36 ` Mika Westerberg
2022-12-19 15:12 ` Tokunori Ikegami
2022-12-19 15:12 ` Tokunori Ikegami
2022-12-20 5:51 ` Tudor Ambarus
2022-12-20 5:51 ` Tudor Ambarus
2022-12-20 14:41 ` Arnd Bergmann
2022-12-20 14:41 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221215163950.649791-1-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=arnd@arndb.de \
--cc=boris.brezillon@collabora.com \
--cc=ikegami.t@gmail.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=mauro.lima@eclypsium.com \
--cc=mika.westerberg@linux.intel.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=tudor.ambarus@microchip.com \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.