diff mbox

mtd: nand: oxnas_nand: fix build errors on arch/um, require HAS_IOMEM

Message ID 8a756f24-4c18-690c-b898-03ecf3d71c84@infradead.org
State Accepted
Commit f0fcdc506b76e924c60fa607bba5872ca4745476
Headers show

Commit Message

Randy Dunlap Jan. 2, 2017, 2:58 a.m. UTC
From: Randy Dunlap <rdunlap@infradead.org>

Fix build errors on arch/um, which does not support HAS_IOMEM,
while the oxnas_nand.c driver uses interfaces that are
supplied by HAS_IOMEM.

(loadable module build:)
ERROR: "devm_ioremap_resource" [drivers/mtd/nand/oxnas_nand.ko] undefined!
or (built-in build:)
drivers/built-in.o: In function `oxnas_nand_probe':
drivers/mtd/nand/oxnas_nand.c:102: undefined reference to `devm_ioremap_resource'

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc:	Jeff Dike <jdike@addtoit.com>
Cc:	Richard Weinberger <richard@nod.at>
Cc:	user-mode-linux-devel@lists.sourceforge.net
Cc:	linux-mtd@lists.infradead.org
---
 drivers/mtd/nand/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Comments

Neil Armstrong Jan. 2, 2017, 8:33 a.m. UTC | #1
On 01/02/2017 03:58 AM, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build errors on arch/um, which does not support HAS_IOMEM,
> while the oxnas_nand.c driver uses interfaces that are
> supplied by HAS_IOMEM.
> 
> (loadable module build:)
> ERROR: "devm_ioremap_resource" [drivers/mtd/nand/oxnas_nand.ko] undefined!
> or (built-in build:)
> drivers/built-in.o: In function `oxnas_nand_probe':
> drivers/mtd/nand/oxnas_nand.c:102: undefined reference to `devm_ioremap_resource'
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc:	Jeff Dike <jdike@addtoit.com>
> Cc:	Richard Weinberger <richard@nod.at>
> Cc:	user-mode-linux-devel@lists.sourceforge.net
> Cc:	linux-mtd@lists.infradead.org
> ---
>  drivers/mtd/nand/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- lnx-410-rc2.orig/drivers/mtd/nand/Kconfig
> +++ lnx-410-rc2/drivers/mtd/nand/Kconfig
> @@ -426,6 +426,7 @@ config MTD_NAND_ORION
>  
>  config MTD_NAND_OXNAS
>  	tristate "NAND Flash support for Oxford Semiconductor SoC"
> +	depends on HAS_IOMEM
>  	help
>  	  This enables the NAND flash controller on Oxford Semiconductor SoCs.
>  
> 

Thanks Randy,

Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Boris Brezillon Jan. 3, 2017, 8:20 a.m. UTC | #2
On Sun, 1 Jan 2017 18:58:27 -0800
Randy Dunlap <rdunlap@infradead.org> wrote:

> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build errors on arch/um, which does not support HAS_IOMEM,
> while the oxnas_nand.c driver uses interfaces that are
> supplied by HAS_IOMEM.
> 
> (loadable module build:)
> ERROR: "devm_ioremap_resource" [drivers/mtd/nand/oxnas_nand.ko] undefined!
> or (built-in build:)
> drivers/built-in.o: In function `oxnas_nand_probe':
> drivers/mtd/nand/oxnas_nand.c:102: undefined reference to `devm_ioremap_resource'

Applied to nand/fixes. It should appear in one of the next -rc
(probably not -rc3 though).

Thanks,

Boris

> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc:	Jeff Dike <jdike@addtoit.com>
> Cc:	Richard Weinberger <richard@nod.at>
> Cc:	user-mode-linux-devel@lists.sourceforge.net
> Cc:	linux-mtd@lists.infradead.org
> ---
>  drivers/mtd/nand/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- lnx-410-rc2.orig/drivers/mtd/nand/Kconfig
> +++ lnx-410-rc2/drivers/mtd/nand/Kconfig
> @@ -426,6 +426,7 @@ config MTD_NAND_ORION
>  
>  config MTD_NAND_OXNAS
>  	tristate "NAND Flash support for Oxford Semiconductor SoC"
> +	depends on HAS_IOMEM
>  	help
>  	  This enables the NAND flash controller on Oxford Semiconductor SoCs.
>
diff mbox

Patch

--- lnx-410-rc2.orig/drivers/mtd/nand/Kconfig
+++ lnx-410-rc2/drivers/mtd/nand/Kconfig
@@ -426,6 +426,7 @@  config MTD_NAND_ORION
 
 config MTD_NAND_OXNAS
 	tristate "NAND Flash support for Oxford Semiconductor SoC"
+	depends on HAS_IOMEM
 	help
 	  This enables the NAND flash controller on Oxford Semiconductor SoCs.