Re: [PATCH] [v2] mtd: cfi: allow building spi-intel standalone

[Tokunori Ikegami]

On 2022/12/20 23:13, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> 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.
>
> linux/mtd/spi-nor.h does not actually need to include cfi.h, so
> remove the inclusion here to fix the warning. This uncovers a
> missing #include in spi-nor/core.c so add that there to
> prevent a different build issue.
Reviewed-by: Tokunori Ikegami <ikegami.t@xxxxxxxxx>
> Fixes: e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> Reviewed-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> ---
>   drivers/mtd/spi-nor/core.c  | 1 +
>   include/linux/mtd/spi-nor.h | 1 -
>   2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
> index d8703d7dfd0a..d67c926bca8b 100644
> --- a/drivers/mtd/spi-nor/core.c
> +++ b/drivers/mtd/spi-nor/core.c
> @@ -10,6 +10,7 @@
>   #include <linux/err.h>
>   #include <linux/errno.h>
>   #include <linux/module.h>
> +#include <linux/delay.h>
>   #include <linux/device.h>
>   #include <linux/mutex.h>
>   #include <linux/math64.h>
> diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
> index 25765556223a..a3f8cdca90c8 100644
> --- a/include/linux/mtd/spi-nor.h
> +++ b/include/linux/mtd/spi-nor.h
> @@ -7,7 +7,6 @@
>   #define __LINUX_MTD_SPI_NOR_H
>   
>   #include <linux/bitops.h>
> -#include <linux/mtd/cfi.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/spi/spi-mem.h>
>