| Message ID | 1456778924-20730-3-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2016-02-29 at 15:48 -0500, Paul Gortmaker wrote: > The Kconfig for this driver is currently: > > config PINCTRL_MT6397 > bool "Mediatek MT6397 pin control" if COMPILE_TEST && !MFD_MT6397 > > ...meaning that it is currently 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. > > We also delete the MODULE_LICENSE tag etc. since all that information > is already contained at the top of the file in the comments. > > Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: Hongzhou Yang <hongzhou.yang@mediatek.com> > Cc: linux-gpio@vger.kernel.org > Cc: linux-mediatek@lists.infradead.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > drivers/pinctrl/mediatek/pinctrl-mt6397.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6397.c b/drivers/pinctrl/mediatek/pinctrl-mt6397.c > index f9751ae28e32..6eccb85c02cd 100644 > --- a/drivers/pinctrl/mediatek/pinctrl-mt6397.c > +++ b/drivers/pinctrl/mediatek/pinctrl-mt6397.c > @@ -12,7 +12,7 @@ > * GNU General Public License for more details. > */ > > -#include <linux/module.h> > +#include <linux/init.h> > #include <linux/platform_device.h> > #include <linux/of.h> > #include <linux/of_device.h> > @@ -55,7 +55,6 @@ static const struct of_device_id mt6397_pctrl_match[] = { > { .compatible = "mediatek,mt6397-pinctrl", }, > { } > }; > -MODULE_DEVICE_TABLE(of, mt6397_pctrl_match); > > static struct platform_driver mtk_pinctrl_driver = { > .probe = mt6397_pinctrl_probe, > @@ -69,9 +68,4 @@ static int __init mtk_pinctrl_init(void) > { > return platform_driver_register(&mtk_pinctrl_driver); > } > - > -module_init(mtk_pinctrl_init); > - > -MODULE_LICENSE("GPL v2"); > -MODULE_DESCRIPTION("MediaTek MT6397 Pinctrl Driver"); > -MODULE_AUTHOR("Hongzhou Yang <hongzhou.yang@mediatek.com>"); > +device_initcall(mtk_pinctrl_init); Acked-by: Hongzhou Yang <hongzhou.yang@mediatek.com> Thanks, Hongzhou
On Tue, Mar 1, 2016 at 3:48 AM, Paul Gortmaker <paul.gortmaker@windriver.com> wrote: > The Kconfig for this driver is currently: > > config PINCTRL_MT6397 > bool "Mediatek MT6397 pin control" if COMPILE_TEST && !MFD_MT6397 > > ...meaning that it is currently 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. > > We also delete the MODULE_LICENSE tag etc. since all that information > is already contained at the top of the file in the comments. > > Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: Hongzhou Yang <hongzhou.yang@mediatek.com> > Cc: linux-gpio@vger.kernel.org > Cc: linux-mediatek@lists.infradead.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Patch applied with Honzhou's ACK. Yours, Linus Walleij
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6397.c b/drivers/pinctrl/mediatek/pinctrl-mt6397.c index f9751ae28e32..6eccb85c02cd 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt6397.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt6397.c @@ -12,7 +12,7 @@ * GNU General Public License for more details. */ -#include <linux/module.h> +#include <linux/init.h> #include <linux/platform_device.h> #include <linux/of.h> #include <linux/of_device.h> @@ -55,7 +55,6 @@ static const struct of_device_id mt6397_pctrl_match[] = { { .compatible = "mediatek,mt6397-pinctrl", }, { } }; -MODULE_DEVICE_TABLE(of, mt6397_pctrl_match); static struct platform_driver mtk_pinctrl_driver = { .probe = mt6397_pinctrl_probe, @@ -69,9 +68,4 @@ static int __init mtk_pinctrl_init(void) { return platform_driver_register(&mtk_pinctrl_driver); } - -module_init(mtk_pinctrl_init); - -MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("MediaTek MT6397 Pinctrl Driver"); -MODULE_AUTHOR("Hongzhou Yang <hongzhou.yang@mediatek.com>"); +device_initcall(mtk_pinctrl_init);
The Kconfig for this driver is currently: config PINCTRL_MT6397 bool "Mediatek MT6397 pin control" if COMPILE_TEST && !MFD_MT6397 ...meaning that it is currently 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. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: Hongzhou Yang <hongzhou.yang@mediatek.com> Cc: linux-gpio@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/pinctrl/mediatek/pinctrl-mt6397.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)