Re: [PATCH 1/6] memory: atmel-sdramc: make it explicitly non-modular
From: Nicolas Ferre
Date: Fri Jun 17 2016 - 03:31:13 EST
Le 17/06/2016 02:37, Paul Gortmaker a écrit :
> The Kconfig for this option is currently:
>
> config ATMEL_SDRAMC
> bool "Atmel (Multi-port DDR-)SDRAM Controller"
>
> ...meaning that it currently is not being built as a module by anyone.
> Lets remove the couple traces of modularity, so that when reading the
> driver there is no doubt it is builtin-only.
>
> Since module_init translates to device_initcall in the non-modular
> case, the init ordering remains unchanged with this commit. An
> alternate init level might be worth considering at a later date.
>
> 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
> was (or is now) contained at the top of the file in the comments.
>
> Cc: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
> Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> ---
> drivers/memory/atmel-sdramc.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/memory/atmel-sdramc.c b/drivers/memory/atmel-sdramc.c
> index a3ebc8a87479..53a341f3b305 100644
> --- a/drivers/memory/atmel-sdramc.c
> +++ b/drivers/memory/atmel-sdramc.c
> @@ -1,6 +1,8 @@
> /*
> * Atmel (Multi-port DDR-)SDRAM Controller driver
> *
> + * Author: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
> + *
> * Copyright (C) 2014 Atmel
> *
> * This program is free software: you can redistribute it and/or modify
> @@ -20,7 +22,7 @@
> #include <linux/clk.h>
> #include <linux/err.h>
> #include <linux/kernel.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
> #include <linux/of_platform.h>
> #include <linux/platform_device.h>
>
> @@ -48,7 +50,6 @@ static const struct of_device_id atmel_ramc_of_match[] = {
> { .compatible = "atmel,sama5d3-ddramc", .data = &sama5d3_caps, },
> {},
> };
> -MODULE_DEVICE_TABLE(of, atmel_ramc_of_match);
>
> static int atmel_ramc_probe(struct platform_device *pdev)
> {
> @@ -90,8 +91,4 @@ static int __init atmel_ramc_init(void)
> {
> return platform_driver_register(&atmel_ramc_driver);
> }
> -module_init(atmel_ramc_init);
> -
> -MODULE_LICENSE("GPL v2");
> -MODULE_AUTHOR("Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>");
> -MODULE_DESCRIPTION("Atmel (Multi-port DDR-)SDRAM Controller");
> +device_initcall(atmel_ramc_init);
>
--
Nicolas Ferre