Message ID | 1456778924-20730-6-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
2016-02-29 21:48 GMT+01:00 Paul Gortmaker <paul.gortmaker@windriver.com>: > The Kconfig currently controlling compilation of this code is: > > drivers/pinctrl/stm32/Kconfig:config PINCTRL_STM32F429 > drivers/pinctrl/stm32/Kconfig: bool "STMicroelectronics STM32F429 pin control" if COMPILE_TEST && !MACH_STM32F429 > > ...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 translates to device_initcall in the non-modular > case, 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: Linus Walleij <linus.walleij@linaro.org> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Patrice Chotard <patrice.chotard@st.com> > Cc: linux-gpio@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > drivers/pinctrl/stm32/pinctrl-stm32f429.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) Thanks for the patch: Acked-by: Maxime Coquelin <mcoquelin.stm32@gmail.com> Regards, Maxime
On Tue, Mar 1, 2016 at 3:48 AM, Paul Gortmaker <paul.gortmaker@windriver.com> wrote: > The Kconfig currently controlling compilation of this code is: > > drivers/pinctrl/stm32/Kconfig:config PINCTRL_STM32F429 > drivers/pinctrl/stm32/Kconfig: bool "STMicroelectronics STM32F429 pin control" if COMPILE_TEST && !MACH_STM32F429 > > ...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 translates to device_initcall in the non-modular > case, 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: Linus Walleij <linus.walleij@linaro.org> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Patrice Chotard <patrice.chotard@st.com> > Cc: linux-gpio@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Patch applied with Maxime's ACK. Yours, Linus Walleij
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32f429.c b/drivers/pinctrl/stm32/pinctrl-stm32f429.c index f34016b51375..e9b15dc0654b 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32f429.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32f429.c @@ -4,7 +4,6 @@ * License terms: GNU General Public License (GPL), version 2 */ #include <linux/init.h> -#include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> @@ -1576,7 +1575,6 @@ static const struct of_device_id stm32f429_pctrl_match[] = { }, { } }; -MODULE_DEVICE_TABLE(of, stm32f429_pctrl_match); static struct platform_driver stm32f429_pinctrl_driver = { .probe = stm32_pctl_probe, @@ -1590,9 +1588,4 @@ static int __init stm32f429_pinctrl_init(void) { return platform_driver_register(&stm32f429_pinctrl_driver); } - -module_init(stm32f429_pinctrl_init); - -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("STM32F429 Pinctrl Driver"); -MODULE_AUTHOR("Maxime Coquelin <mcoquelin.stm32@gmail.com>"); +device_initcall(stm32f429_pinctrl_init);
The Kconfig currently controlling compilation of this code is: drivers/pinctrl/stm32/Kconfig:config PINCTRL_STM32F429 drivers/pinctrl/stm32/Kconfig: bool "STMicroelectronics STM32F429 pin control" if COMPILE_TEST && !MACH_STM32F429 ...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 translates to device_initcall in the non-modular case, 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: Linus Walleij <linus.walleij@linaro.org> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Patrice Chotard <patrice.chotard@st.com> Cc: linux-gpio@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/pinctrl/stm32/pinctrl-stm32f429.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)