watchdog: Use module_pci_driver
PATCH 1/1 watchdog: Use module_pci_driver
This patch converts the PCI watchdog drivers so that they use the module_pci_driver() macro. This makes the code smaller and simpler.
Signed-off-by Wim Van Sebroeck <[email protected]>
Cc Thomas Mingarelli <[email protected]>
Cc Marc Vertes <[email protected]>
drivers/watchdog/hpwdt.c +1 -12
@@ -855,16 +855,6 @@ static struct pci_driver hpwdt_driver = { .remove = __devexit_p(hpwdt_exit), }; -static void __exit hpwdt_cleanup(void) -{ -pci_unregister_driver (&hpwdt_driver); -} - -static int __init hpwdt_init (void ) -{ -return pci_register_driver (&hpwdt_driver); -} -MODULE_AUTHOR ("Tom Mingarelli" );MODULE_DESCRIPTION ("hp watchdog driver" );MODULE_LICENSE ("GPL" );
@@ -887,5 +877,4 @@ MODULE_PARM_DESC(priority, "The hpwdt driver handles NMIs first or last" " (default = 0/Last)\n");#endif /* !CONFIG_HPWDT_NMI_DECODING */ -module_init (hpwdt_init); -module_exit (hpwdt_cleanup); +module_pci_driver (hpwdt_driver);
drivers/watchdog/i6300esb.c +1 -13
@@ -492,19 +492,7 @@ static struct pci_driver esb_driver = { .shutdown = esb_shutdown, }; -static int __init watchdog_init (void ) -{ -return pci_register_driver (&esb_driver); -} - -static void __exit watchdog_cleanup(void) -{ -pci_unregister_driver (&esb_driver); -pr_info ("Watchdog Module Unloaded\n" ); -} - -module_init (watchdog_init); -module_exit (watchdog_cleanup); +module_pci_driver (esb_driver);MODULE_AUTHOR ("Ross Biro and David Härdeman" );MODULE_DESCRIPTION ("Watchdog driver for Intel 6300ESB chipsets" );
drivers/watchdog/pcwd_pci.c +2 -16
@@ -707,6 +707,7 @@ static int __devinit pcipcwd_card_init(struct pci_dev *pdev, goto err_out_disable_device; } +spin_lock_init (&pcipcwd_private.io_lock); pcipcwd_private.pdev = pdev; pcipcwd_private.io_addr =pci_resource_start (pdev,0 );
@@ -814,22 +815,7 @@ static struct pci_driver pcipcwd_driver = { .remove = __devexit_p(pcipcwd_card_exit), }; -static int __init pcipcwd_init_module (void ) -{ -spin_lock_init (&pcipcwd_private.io_lock); - -return pci_register_driver (&pcipcwd_driver); -} - -static void __exit pcipcwd_cleanup_module(void) -{ -pci_unregister_driver (&pcipcwd_driver); - -pr_info ("Watchdog Module Unloaded\n" ); -} - -module_init (pcipcwd_init_module); -module_exit (pcipcwd_cleanup_module); +module_pci_driver (pcipcwd_driver);MODULE_AUTHOR ("Wim Van Sebroeck <[email protected]>" );MODULE_DESCRIPTION ("Berkshire PCI-PC Watchdog driver" );
drivers/watchdog/via_wdt.c +4 -14
@@ -202,6 +202,9 @@ static int __devinit wdt_probe(struct pci_dev *pdev, goto err_out_release; } +if (timeout <1 || timeout >WDT_TIMEOUT_MAX ) + timeout =WDT_TIMEOUT ; + wdt_dev.timeout = timeout;watchdog_set_nowayout (&wdt_dev, nowayout);if (readl (wdt_mem) &VIA_WDT_FIRED )
@@ -250,20 +253,7 @@ static struct pci_driver wdt_driver = { .remove = __devexit_p(wdt_remove), }; -static int __init wdt_init (void ) -{ -if (timeout <1 || timeout >WDT_TIMEOUT_MAX ) - timeout =WDT_TIMEOUT ; -return pci_register_driver (&wdt_driver); -} - -static void __exit wdt_exit(void) -{ -pci_unregister_driver (&wdt_driver); -} - -module_init (wdt_init); -module_exit (wdt_exit); +module_pci_driver (wdt_driver);MODULE_AUTHOR ("Marc Vertes" );MODULE_DESCRIPTION ("Driver for watchdog timer on VIA chipset" );
drivers/watchdog/wdt_pci.c +1 -33
@@ -739,39 +739,7 @@ static struct pci_driver wdtpci_driver = { .remove = __devexit_p(wdtpci_remove_one), }; - -/** -* wdtpci_cleanup: -* -* Unload the watchdog. You cannot do this with any file handles open. -* If your watchdog is set to continue ticking on close and you unload -* it, well it keeps ticking. We won't get the interrupt but the board -* will not touch PC memory so all is fine. You just have to load a new -* module in xx seconds or reboot. -*/ - -static void __exit wdtpci_cleanup(void) -{ -pci_unregister_driver (&wdtpci_driver); -} - - -/** -* wdtpci_init: -* -* Set up the WDT watchdog board. All we have to do is grab the -* resources we require and bitch if anyone beat us to them. -* The open() function will actually kick the board off. -*/ - -static int __init wdtpci_init (void ) -{ -return pci_register_driver (&wdtpci_driver); -} - - -module_init (wdtpci_init); -module_exit (wdtpci_cleanup); +module_pci_driver (wdtpci_driver);MODULE_AUTHOR ("JP Nollmann, Alan Cox" );MODULE_DESCRIPTION ("Driver for the ICS PCI-WDT500/501 watchdog cards" );
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html