Re: [PATCH 4/8] drivers/pinctrl: make sh-pfc/core.c explicitly non-modular

From: Laurent Pinchart
Date: Mon Feb 29 2016 - 17:00:36 EST


Hi Paul,

Thank you for the patch.

On Monday 29 February 2016 15:48:40 Paul Gortmaker wrote:
> The Kconfig / Makefile currently controlling compilation of this code is:
>
> drivers/pinctrl/sh-pfc/Makefile:obj-$(CONFIG_PINCTRL_SH_PFC) += sh-pfc.o
> drivers/pinctrl/sh-pfc/Makefile:sh-pfc-objs = core.o
> pinctrl.o
>
> drivers/pinctrl/sh-pfc/Kconfig:config PINCTRL_SH_PFC
> drivers/pinctrl/sh-pfc/Kconfig: def_bool y
>
> ...meaning that it currently is not being built as a module by anyone.
>
> Lets remove the modular code that is essentially orphaned, so that
> when reading the driver there is no doubt it is builtin-only.
>
> Since module_init already wasn't being used in this code, 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
> was (or is now) contained at the top of the file in the comments.
>
> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Cc: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
> Cc: linux-renesas-soc@xxxxxxxxxxxxxxx
> Cc: linux-gpio@xxxxxxxxxxxxxxx
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>

Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>

> ---
> drivers/pinctrl/sh-pfc/core.c | 18 ++++--------------
> 1 file changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
> index 181ea98a63b7..3f3f904e458b 100644
> --- a/drivers/pinctrl/sh-pfc/core.c
> +++ b/drivers/pinctrl/sh-pfc/core.c
> @@ -1,5 +1,7 @@
> /*
> - * SuperH Pin Function Controller support.
> + * Pin Control and GPIO driver for SuperH Pin Function Controller.
> + *
> + * Authors: Magnus Damm, Paul Mundt, Laurent Pinchart
> *
> * Copyright (C) 2008 Magnus Damm
> * Copyright (C) 2009 - 2012 Paul Mundt
> @@ -17,7 +19,7 @@
> #include <linux/io.h>
> #include <linux/ioport.h>
> #include <linux/kernel.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
> #include <linux/of.h>
> #include <linux/of_device.h>
> #include <linux/pinctrl/machine.h>
> @@ -503,7 +505,6 @@ static const struct of_device_id sh_pfc_of_table[] = {
> #endif
> { },
> };
> -MODULE_DEVICE_TABLE(of, sh_pfc_of_table);
> #endif
>
> static int sh_pfc_probe(struct platform_device *pdev)
> @@ -632,7 +633,6 @@ static const struct platform_device_id sh_pfc_id_table[]
> = { { "sh-pfc", 0 },
> { },
> };
> -MODULE_DEVICE_TABLE(platform, sh_pfc_id_table);
>
> static struct platform_driver sh_pfc_driver = {
> .probe = sh_pfc_probe,
> @@ -649,13 +649,3 @@ static int __init sh_pfc_init(void)
> return platform_driver_register(&sh_pfc_driver);
> }
> postcore_initcall(sh_pfc_init);
> -
> -static void __exit sh_pfc_exit(void)
> -{
> - platform_driver_unregister(&sh_pfc_driver);
> -}
> -module_exit(sh_pfc_exit);
> -
> -MODULE_AUTHOR("Magnus Damm, Paul Mundt, Laurent Pinchart");
> -MODULE_DESCRIPTION("Pin Control and GPIO driver for SuperH pin function
> controller"); -MODULE_LICENSE("GPL v2");

--
Regards,

Laurent Pinchart