[PATCH V2 1/2] mtd: nand: xway: disable module support

[PATCH V2 1/2] mtd: nand: xway: disable module support

[Hauke Mehrtens]

The xway_nand driver accesses the ltq_ebu_membase symbol which is not
exported. This also should not get exported and we should handle the
EBU interface in a better way later. This quick fix just deactivated
support for building as module.

Cc: <stable@vger.kernel.org>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 drivers/mtd/nand/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 7b7a887..b254090 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -537,7 +537,7 @@ config MTD_NAND_FSMC
 	  Flexible Static Memory Controller (FSMC)
 
 config MTD_NAND_XWAY
-	tristate "Support for NAND on Lantiq XWAY SoC"
+	bool "Support for NAND on Lantiq XWAY SoC"
 	depends on LANTIQ && SOC_TYPE_XWAY
 	help
 	  Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
-- 
2.10.2

[PATCH V2 2/2] mtd: nand: xway: fix build because of module functions

[Hauke Mehrtens]

Remove the usage of modules functions to make this driver compile
again. Otherwise an include of linux/modules.h would be needed.

Fixes: 024366750c2e ("mtd: nand: xway: convert to normal platform driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 drivers/mtd/nand/xway_nand.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
index 1f2948c..895101a 100644
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/xway_nand.c
@@ -232,7 +232,6 @@ static const struct of_device_id xway_nand_match[] = {
 	{ .compatible = "lantiq,nand-xway" },
 	{},
 };
-MODULE_DEVICE_TABLE(of, xway_nand_match);
 
 static struct platform_driver xway_nand_driver = {
 	.probe	= xway_nand_probe,
@@ -243,6 +242,4 @@ static struct platform_driver xway_nand_driver = {
 	},
 };
 
-module_platform_driver(xway_nand_driver);
-
-MODULE_LICENSE("GPL");
+builtin_platform_driver(xway_nand_driver);
-- 
2.10.2

Re: [PATCH V2 1/2] mtd: nand: xway: disable module support

[Boris Brezillon]

On Mon,  5 Dec 2016 22:14:36 +0100
Hauke Mehrtens <hauke@hauke-m.de> wrote:

> The xway_nand driver accesses the ltq_ebu_membase symbol which is not
> exported. This also should not get exported and we should handle the
> EBU interface in a better way later. This quick fix just deactivated
> support for building as module.
> 
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

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

Thanks,

Boris

> ---
>  drivers/mtd/nand/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> index 7b7a887..b254090 100644
> --- a/drivers/mtd/nand/Kconfig
> +++ b/drivers/mtd/nand/Kconfig
> @@ -537,7 +537,7 @@ config MTD_NAND_FSMC
>  	  Flexible Static Memory Controller (FSMC)
>  
>  config MTD_NAND_XWAY
> -	tristate "Support for NAND on Lantiq XWAY SoC"
> +	bool "Support for NAND on Lantiq XWAY SoC"
>  	depends on LANTIQ && SOC_TYPE_XWAY
>  	help
>  	  Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached