Commit 4b12b896 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

watchdog: remove use of __devexit

CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d131368
......@@ -275,7 +275,7 @@ out:
return ret;
}
static int __devexit acq_remove(struct platform_device *dev)
static int acq_remove(struct platform_device *dev)
{
misc_deregister(&acq_miscdev);
release_region(wdt_start, 1);
......
......@@ -282,7 +282,7 @@ unreg_stop:
goto out;
}
static int __devexit advwdt_remove(struct platform_device *dev)
static int advwdt_remove(struct platform_device *dev)
{
misc_deregister(&advwdt_miscdev);
release_region(wdt_start, 1);
......
......@@ -314,7 +314,7 @@ out:
return rc;
}
static int __devexit ar7_wdt_remove(struct platform_device *pdev)
static int ar7_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&ar7_wdt_miscdev);
clk_put(vbus_clk);
......
......@@ -216,7 +216,7 @@ static int at91wdt_probe(struct platform_device *pdev)
return 0;
}
static int __devexit at91wdt_remove(struct platform_device *pdev)
static int at91wdt_remove(struct platform_device *pdev)
{
int res;
......
......@@ -270,7 +270,7 @@ err_clk_put:
return err;
}
static int __devexit ath79_wdt_remove(struct platform_device *pdev)
static int ath79_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&ath79_wdt_miscdev);
clk_disable(wdt_clk);
......
......@@ -286,7 +286,7 @@ unmap:
return ret;
}
static int __devexit bcm63xx_wdt_remove(struct platform_device *pdev)
static int bcm63xx_wdt_remove(struct platform_device *pdev)
{
if (!nowayout)
bcm63xx_wdt_pause();
......
......@@ -379,7 +379,7 @@ static int bfin_wdt_probe(struct platform_device *pdev)
* Unregisters the misc device. Actual device
* deinitialization is handled by bfin_wdt_close().
*/
static int __devexit bfin_wdt_remove(struct platform_device *pdev)
static int bfin_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&bfin_wdt_miscdev);
return 0;
......
......@@ -261,7 +261,7 @@ static int cpu5wdt_init_module(void)
return cpu5wdt_init();
}
static void __devexit cpu5wdt_exit(void)
static void cpu5wdt_exit(void)
{
if (cpu5wdt_device.queue) {
cpu5wdt_device.queue = 0;
......@@ -274,7 +274,7 @@ static void __devexit cpu5wdt_exit(void)
}
static void __devexit cpu5wdt_exit_module(void)
static void cpu5wdt_exit_module(void)
{
cpu5wdt_exit();
}
......
......@@ -640,7 +640,7 @@ out_free:
goto out;
}
static int __devexit cpwd_remove(struct platform_device *op)
static int cpwd_remove(struct platform_device *op)
{
struct cpwd *p = dev_get_drvdata(&op->dev);
int i;
......
......@@ -224,7 +224,7 @@ err:
return ret;
}
static int __devexit da9052_wdt_remove(struct platform_device *pdev)
static int da9052_wdt_remove(struct platform_device *pdev)
{
struct da9052_wdt_data *driver_data = dev_get_drvdata(&pdev->dev);
......
......@@ -248,7 +248,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
return ret;
}
static int __devexit davinci_wdt_remove(struct platform_device *pdev)
static int davinci_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&davinci_wdt_miscdev);
if (wdt_mem) {
......
......@@ -333,7 +333,7 @@ out_put_clk:
return ret;
}
static int __devexit dw_wdt_drv_remove(struct platform_device *pdev)
static int dw_wdt_drv_remove(struct platform_device *pdev)
{
misc_deregister(&dw_wdt_miscdev);
......
......@@ -156,7 +156,7 @@ static int ep93xx_wdt_probe(struct platform_device *pdev)
return 0;
}
static int __devexit ep93xx_wdt_remove(struct platform_device *pdev)
static int ep93xx_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&ep93xx_wdt_wdd);
return 0;
......
......@@ -285,7 +285,7 @@ static int gef_wdt_probe(struct platform_device *dev)
return misc_register(&gef_wdt_miscdev);
}
static int __devexit gef_wdt_remove(struct platform_device *dev)
static int gef_wdt_remove(struct platform_device *dev)
{
misc_deregister(&gef_wdt_miscdev);
......
......@@ -243,7 +243,7 @@ static int geodewdt_probe(struct platform_device *dev)
return ret;
}
static int __devexit geodewdt_remove(struct platform_device *dev)
static int geodewdt_remove(struct platform_device *dev)
{
misc_deregister(&geodewdt_miscdev);
return 0;
......
......@@ -848,7 +848,7 @@ error_pci_iomap:
return retval;
}
static void __devexit hpwdt_exit(struct pci_dev *dev)
static void hpwdt_exit(struct pci_dev *dev)
{
if (!nowayout)
hpwdt_stop();
......
......@@ -465,7 +465,7 @@ err_unmap:
return ret;
}
static void __devexit esb_remove(struct pci_dev *pdev)
static void esb_remove(struct pci_dev *pdev)
{
/* Stop the timer before we leave */
if (!nowayout)
......
......@@ -364,7 +364,7 @@ static struct watchdog_device iTCO_wdt_watchdog_dev = {
* Init & exit routines
*/
static void __devexit iTCO_wdt_cleanup(void)
static void iTCO_wdt_cleanup(void)
{
/* Stop the timer before we leave */
if (!nowayout)
......@@ -533,7 +533,7 @@ out:
return ret;
}
static int __devexit iTCO_wdt_remove(struct platform_device *dev)
static int iTCO_wdt_remove(struct platform_device *dev)
{
if (iTCO_wdt_private.tco_res || iTCO_wdt_private.smi_res)
iTCO_wdt_cleanup();
......
......@@ -319,7 +319,7 @@ out_nostopreg:
return res;
}
static int __devexit ibwdt_remove(struct platform_device *dev)
static int ibwdt_remove(struct platform_device *dev)
{
misc_deregister(&ibwdt_miscdev);
release_region(WDT_START, 1);
......
......@@ -295,7 +295,7 @@ misc_register_error:
return ret;
}
static int __devexit ie6xx_wdt_remove(struct platform_device *pdev)
static int ie6xx_wdt_remove(struct platform_device *pdev)
{
struct resource *res;
......
......@@ -197,7 +197,7 @@ err_out:
return ret;
}
static int __devexit jz4740_wdt_remove(struct platform_device *pdev)
static int jz4740_wdt_remove(struct platform_device *pdev)
{
struct jz4740_wdt_drvdata *drvdata = platform_get_drvdata(pdev);
......
......@@ -252,7 +252,7 @@ static int ks8695wdt_probe(struct platform_device *pdev)
return 0;
}
static int __devexit ks8695wdt_remove(struct platform_device *pdev)
static int ks8695wdt_remove(struct platform_device *pdev)
{
int res;
......
......@@ -220,7 +220,7 @@ ltq_wdt_probe(struct platform_device *pdev)
return misc_register(&ltq_wdt_miscdev);
}
static int __devexit
static int
ltq_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&ltq_wdt_miscdev);
......
......@@ -209,7 +209,7 @@ static int max63xx_wdt_probe(struct platform_device *pdev)
return watchdog_register_device(&max63xx_wdt_dev);
}
static int __devexit max63xx_wdt_remove(struct platform_device *pdev)
static int max63xx_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&max63xx_wdt_dev);
return 0;
......
......@@ -245,7 +245,7 @@ err_unmap:
return ret;
}
static int __devexit mpc8xxx_wdt_remove(struct platform_device *ofdev)
static int mpc8xxx_wdt_remove(struct platform_device *ofdev)
{
mpc8xxx_wdt_pr_warn("watchdog removed");
del_timer_sync(&wdt_timer);
......
......@@ -378,7 +378,7 @@ static int mpcore_wdt_probe(struct platform_device *pdev)
return 0;
}
static int __devexit mpcore_wdt_remove(struct platform_device *pdev)
static int mpcore_wdt_remove(struct platform_device *pdev)
{
platform_set_drvdata(pdev, NULL);
......
......@@ -233,7 +233,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
return 0;
}
static int __devexit mtx1_wdt_remove(struct platform_device *pdev)
static int mtx1_wdt_remove(struct platform_device *pdev)
{
/* FIXME: do we need to lock this test ? */
if (mtx1_wdt_device.queue) {
......
......@@ -287,7 +287,7 @@ static int mv64x60_wdt_probe(struct platform_device *dev)
return misc_register(&mv64x60_wdt_miscdev);
}
static int __devexit mv64x60_wdt_remove(struct platform_device *dev)
static int mv64x60_wdt_remove(struct platform_device *dev)
{
misc_deregister(&mv64x60_wdt_miscdev);
......
......@@ -309,7 +309,7 @@ err_get:
return ret;
}
static int __devexit nuc900wdt_remove(struct platform_device *pdev)
static int nuc900wdt_remove(struct platform_device *pdev)
{
misc_deregister(&nuc900wdt_miscdev);
......
......@@ -423,7 +423,7 @@ unreg_region:
return ret;
}
static void __devexit nv_tco_cleanup(void)
static void nv_tco_cleanup(void)
{
u32 val;
......@@ -445,7 +445,7 @@ static void __devexit nv_tco_cleanup(void)
release_region(tcobase, 0x10);
}
static int __devexit nv_tco_remove(struct platform_device *dev)
static int nv_tco_remove(struct platform_device *dev)
{
if (tcobase)
nv_tco_cleanup();
......
......@@ -383,7 +383,7 @@ err_out:
return rc;
}
static int __devexit xwdt_remove(struct platform_device *dev)
static int xwdt_remove(struct platform_device *dev)
{
misc_deregister(&xwdt_miscdev);
iounmap(xdev.base);
......
......@@ -359,7 +359,7 @@ static void omap_wdt_shutdown(struct platform_device *pdev)
}
}
static int __devexit omap_wdt_remove(struct platform_device *pdev)
static int omap_wdt_remove(struct platform_device *pdev)
{
struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
......
......@@ -181,7 +181,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
return 0;
}
static int __devexit orion_wdt_remove(struct platform_device *pdev)
static int orion_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&orion_wdt);
clk_disable_unprepare(clk);
......
......@@ -949,7 +949,7 @@ error_request_region:
return ret;
}
static int __devexit pcwd_isa_remove(struct device *dev, unsigned int id)
static int pcwd_isa_remove(struct device *dev, unsigned int id)
{
if (debug >= DEBUG)
pr_debug("pcwd_isa_remove id=%d\n", id);
......
......@@ -785,7 +785,7 @@ err_out_disable_device:
return ret;
}
static void __devexit pcipcwd_card_exit(struct pci_dev *pdev)
static void pcipcwd_card_exit(struct pci_dev *pdev)
{
/* Stop the timer before we leave */
if (!nowayout)
......
......@@ -192,7 +192,7 @@ out:
return ret;
}
static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
static int pnx4008_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&pnx4008_wdd);
......
......@@ -306,7 +306,7 @@ unmap:
return ret;
}
static int __devexit rc32434_wdt_remove(struct platform_device *pdev)
static int rc32434_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&rc32434_wdt_miscdev);
iounmap(wdt_reg);
......
......@@ -272,7 +272,7 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
return 0;
}
static int __devexit rdc321x_wdt_remove(struct platform_device *pdev)
static int rdc321x_wdt_remove(struct platform_device *pdev)
{
if (rdc321x_wdt_device.queue) {
rdc321x_wdt_device.queue = 0;
......
......@@ -220,7 +220,7 @@ out:
return err;
}
static int __devexit riowd_remove(struct platform_device *op)
static int riowd_remove(struct platform_device *op)
{
struct riowd *p = dev_get_drvdata(&op->dev);
......
......@@ -437,7 +437,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
return ret;
}
static int __devexit s3c2410wdt_remove(struct platform_device *dev)
static int s3c2410wdt_remove(struct platform_device *dev)
{
watchdog_unregister_device(&s3c2410_wdd);
......
......@@ -429,7 +429,7 @@ exit:
return err;
}
static int __devexit sch311x_wdt_remove(struct platform_device *pdev)
static int sch311x_wdt_remove(struct platform_device *pdev)
{
/* Stop the timer before we leave */
if (!nowayout)
......
......@@ -298,7 +298,7 @@ err:
return rc;
}
static int __devexit sh_wdt_remove(struct platform_device *pdev)
static int sh_wdt_remove(struct platform_device *pdev)
{
struct sh_wdt *wdt = platform_get_drvdata(pdev);
......
......@@ -412,7 +412,7 @@ exit:
return ret;
}
static void __devexit sp5100_tco_cleanup(void)
static void sp5100_tco_cleanup(void)
{
/* Stop the timer before we leave */
if (!nowayout)
......@@ -425,7 +425,7 @@ static void __devexit sp5100_tco_cleanup(void)
release_region(pm_iobase, SP5100_PM_IOPORTS_SIZE);
}
static int __devexit sp5100_tco_remove(struct platform_device *dev)
static int sp5100_tco_remove(struct platform_device *dev)
{
if (tcobase)
sp5100_tco_cleanup();
......
......@@ -272,7 +272,7 @@ err:
return ret;
}
static int __devexit sp805_wdt_remove(struct amba_device *adev)
static int sp805_wdt_remove(struct amba_device *adev)
{
struct sp805_wdt *wdt = amba_get_drvdata(adev);
......
......@@ -229,7 +229,7 @@ static int stmp3xxx_wdt_probe(struct platform_device *pdev)
return ret;
}
static int __devexit stmp3xxx_wdt_remove(struct platform_device *pdev)
static int stmp3xxx_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&stmp3xxx_wdt_miscdev);
return 0;
......
......@@ -476,7 +476,7 @@ fail:
return error;
}
static __devexit int ts72xx_wdt_remove(struct platform_device *pdev)
static int ts72xx_wdt_remove(struct platform_device *pdev)
{
struct ts72xx_wdt *wdt = platform_get_drvdata(pdev);
struct resource *res;
......
......@@ -204,7 +204,7 @@ static int twl4030_wdt_probe(struct platform_device *pdev)
return 0;
}
static int __devexit twl4030_wdt_remove(struct platform_device *pdev)
static int twl4030_wdt_remove(struct platform_device *pdev)
{
struct twl4030_wdt *wdt = platform_get_drvdata(pdev);
......
......@@ -229,7 +229,7 @@ err_out_disable_device:
return ret;
}
static void __devexit wdt_remove(struct pci_dev *pdev)
static void wdt_remove(struct pci_dev *pdev)
{
watchdog_unregister_device(&wdt_dev);
del_timer(&timer);
......
......@@ -705,7 +705,7 @@ out_pci:
}
static void __devexit wdtpci_remove_one(struct pci_dev *pdev)
static void wdtpci_remove_one(struct pci_dev *pdev)
{
/* here we assume only one device will ever have
* been picked up and registered by probe function */
......
......@@ -292,7 +292,7 @@ err:
return ret;
}
static int __devexit wm831x_wdt_remove(struct platform_device *pdev)
static int wm831x_wdt_remove(struct platform_device *pdev)
{
struct wm831x_wdt_drvdata *driver_data = dev_get_drvdata(&pdev->dev);
......
......@@ -158,7 +158,7 @@ static int wm8350_wdt_probe(struct platform_device *pdev)
return watchdog_register_device(&wm8350_wdt);
}
static int __devexit wm8350_wdt_remove(struct platform_device *pdev)
static int wm8350_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&wm8350_wdt);
return 0;
......
......@@ -280,7 +280,7 @@ static int xen_wdt_probe(struct platform_device *dev)
return ret;
}
static int __devexit xen_wdt_remove(struct platform_device *dev)
static int xen_wdt_remove(struct platform_device *dev)
{
/* Stop the timer before we leave */
if (!nowayout)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment