| Message ID | 1556034515-28792-4-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | wdt: clean up unused modular infrastructure | expand |
On Tue, Apr 23, 2019 at 11:48:33AM -0400, Paul Gortmaker wrote: > The Kconfig currently controlling compilation of this code is: > > config NPCM7XX_WATCHDOG > bool "Nuvoton NPCM750 watchdog" > > ...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_platform_driver() uses the same init level priority as > builtin_platform_driver() 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: Avi Fishman <avifishman70@gmail.com> > Cc: Tomer Maimon <tmaimon77@gmail.com> > Cc: Tali Perry <tali.perry1@gmail.com> > Cc: Patrick Venture <venture@google.com> > Cc: Nancy Yuen <yuenn@google.com> > Cc: Benjamin Fair <benjaminfair@google.com> > Cc: Wim Van Sebroeck <wim@linux-watchdog.org> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: openbmc@lists.ozlabs.org > Cc: linux-watchdog@vger.kernel.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> I'll send a different patch to make the driver tristate, to follow the example given by other drivers for the same chipset. Guenter
[Re: [PATCH 3/5] watchdog: npcm: make it explicitly non-modular] On 29/04/2019 (Mon 09:40) Guenter Roeck wrote: > On Tue, Apr 23, 2019 at 11:48:33AM -0400, Paul Gortmaker wrote: > > The Kconfig currently controlling compilation of this code is: > > > > config NPCM7XX_WATCHDOG > > bool "Nuvoton NPCM750 watchdog" > > > > ...meaning that it currently is not being built as a module by anyone. > > [...] > I'll send a different patch to make the driver tristate, > to follow the example given by other drivers for the same chipset. Great, thanks. I'll drop this patch from my internal queue once I see it conflict with your tristate conversion in linux-next. Paul. -- > > Guenter
diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c index 0d4213652ecc..44d305683ab6 100644 --- a/drivers/watchdog/npcm_wdt.c +++ b/drivers/watchdog/npcm_wdt.c @@ -2,11 +2,15 @@ // Copyright (c) 2018 Nuvoton Technology corporation. // Copyright (c) 2018 IBM Corp. +/* + * Watchdog driver for NPCM + * Author: Joel Stanley + */ + #include <linux/bitops.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/kernel.h> -#include <linux/module.h> #include <linux/of_irq.h> #include <linux/platform_device.h> #include <linux/slab.h> @@ -237,7 +241,6 @@ static const struct of_device_id npcm_wdt_match[] = { {.compatible = "nuvoton,npcm750-wdt"}, {}, }; -MODULE_DEVICE_TABLE(of, npcm_wdt_match); #endif static struct platform_driver npcm_wdt_driver = { @@ -247,8 +250,4 @@ static struct platform_driver npcm_wdt_driver = { .of_match_table = of_match_ptr(npcm_wdt_match), }, }; -module_platform_driver(npcm_wdt_driver); - -MODULE_AUTHOR("Joel Stanley"); -MODULE_DESCRIPTION("Watchdog driver for NPCM"); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(npcm_wdt_driver);
The Kconfig currently controlling compilation of this code is: config NPCM7XX_WATCHDOG bool "Nuvoton NPCM750 watchdog" ...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_platform_driver() uses the same init level priority as builtin_platform_driver() 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: Avi Fishman <avifishman70@gmail.com> Cc: Tomer Maimon <tmaimon77@gmail.com> Cc: Tali Perry <tali.perry1@gmail.com> Cc: Patrick Venture <venture@google.com> Cc: Nancy Yuen <yuenn@google.com> Cc: Benjamin Fair <benjaminfair@google.com> Cc: Wim Van Sebroeck <wim@linux-watchdog.org> Cc: Guenter Roeck <linux@roeck-us.net> Cc: openbmc@lists.ozlabs.org Cc: linux-watchdog@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/watchdog/npcm_wdt.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)