Re: [PATCH 6/6] memory: atmel-ebi: make it explicitly non-modular

From: Nicolas Ferre
Date: Fri Jun 17 2016 - 03:35:53 EST


Le 17/06/2016 02:37, Paul Gortmaker a écrit :
> The Kconfig currently controlling compilation of this code is:
>
> drivers/memory/Kconfig:config ATMEL_EBI
> drivers/memory/Kconfig: bool "Atmel EBI driver"
>
> ...meaning that it currently is not being built as a module by anyone.
>
> Lets remove the few remaining modular references, so that when reading
> the driver there is no doubt it is builtin-only.
>
> Since module_platform_driver() uses the same init level priority as
> builtin_platform_driver() the init ordering remains unchanged with
> this commit.
>
> Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
>
> We also delete the MODULE_LICENSE tag etc. since all that information
> is already contained at the top of the file in the comments.
>
> Cc: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>
> Cc: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
> Cc: Jean-Jacques Hiblot <jjhiblot@xxxxxxxxxxxxxxx>
> Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>

Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>

We'll have to take the two atmel-related drivers through our git trees
and arm-soc.

Thanks Paul. Bye.

> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> ---
> drivers/memory/atmel-ebi.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
> index 17d9d3f60f20..f87ad6f5d2dc 100644
> --- a/drivers/memory/atmel-ebi.c
> +++ b/drivers/memory/atmel-ebi.c
> @@ -14,7 +14,7 @@
> #include <linux/mfd/syscon.h>
> #include <linux/mfd/syscon/atmel-matrix.h>
> #include <linux/mfd/syscon/atmel-smc.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
> #include <linux/of_device.h>
> #include <linux/regmap.h>
>
> @@ -648,7 +648,6 @@ static const struct of_device_id at91_ebi_id_table[] = {
> },
> { /* sentinel */ }
> };
> -MODULE_DEVICE_TABLE(of, at91_ebi_id_table);
>
> static int at91_ebi_dev_disable(struct at91_ebi *ebi, struct device_node *np)
> {
> @@ -764,8 +763,4 @@ static struct platform_driver at91_ebi_driver = {
> .of_match_table = at91_ebi_id_table,
> },
> };
> -module_platform_driver_probe(at91_ebi_driver, at91_ebi_probe);
> -
> -MODULE_AUTHOR("Jean-Jacques Hiblot <jjhiblot@xxxxxxxxxxxxxxx>");
> -MODULE_DESCRIPTION("Atmel EBI driver");
> -MODULE_LICENSE("GPL");
> +builtin_platform_driver_probe(at91_ebi_driver, at91_ebi_probe);
>


--
Nicolas Ferre