Re: [PATCH 3/6] mfd: intel_msic: Make it explicitly non-modular

From: Lee Jones
Date: Tue Sep 13 2016 - 04:50:52 EST


On Mon, 12 Sep 2016, Paul Gortmaker wrote:

> The Kconfig currently controlling compilation of this code is:
>
> drivers/mfd/Kconfig:config MFD_INTEL_MSIC
> drivers/mfd/Kconfig: bool "Intel MSIC
>
> ...meaning that it currently is not being built as a module by anyone.
>
> Lets remove the couple instances of module 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.
>
> 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: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> Acked-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> ---
> drivers/mfd/intel_msic.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c
> index 25d486c543cb..2017446c5b4b 100644
> --- a/drivers/mfd/intel_msic.c
> +++ b/drivers/mfd/intel_msic.c
> @@ -12,7 +12,7 @@
> #include <linux/err.h>
> #include <linux/gpio.h>
> #include <linux/io.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
> #include <linux/mfd/core.h>
> #include <linux/mfd/intel_msic.h>
> #include <linux/platform_device.h>
> @@ -449,9 +449,4 @@ static struct platform_driver intel_msic_driver = {
> .name = "intel_msic",
> },
> };
> -
> -module_platform_driver(intel_msic_driver);
> -
> -MODULE_DESCRIPTION("Driver for Intel MSIC");
> -MODULE_AUTHOR("Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>");
> -MODULE_LICENSE("GPL");
> +builtin_platform_driver(intel_msic_driver);

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog