watchdog: remove use of __devexit_p

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill 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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 4397881c83f41fe86e070a932e69814fff12ab6e..49e0b89ceed943dc01f6a3929bd1c075f8611814 100644 (file)
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -293,7 +293,7 @@ static void acq_shutdown(struct platform_device *dev)
 
 static struct platform_driver acquirewdt_driver = {
        .probe          = acq_probe,
-       .remove         = __devexit_p(acq_remove),
+       .remove         = acq_remove,
        .shutdown       = acq_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 64ae9e9fed94acdddab23d0d20ea50f771685ef3..9a74156f05eed6db63454bddf0eec69d119256fb 100644 (file)
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -300,7 +300,7 @@ static void advwdt_shutdown(struct platform_device *dev)
 
 static struct platform_driver advwdt_driver = {
        .probe          = advwdt_probe,
-       .remove         = __devexit_p(advwdt_remove),
+       .remove         = advwdt_remove,
        .shutdown       = advwdt_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index dc30dbd21cf19c0bf126e8e9167899b6e24aaaf9..eb633d9951a2bf7591f2ce48b2d2c73bdd9f3733 100644 (file)
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -330,7 +330,7 @@ static void ar7_wdt_shutdown(struct platform_device *pdev)
 
 static struct platform_driver ar7_wdt_driver = {
        .probe = ar7_wdt_probe,
-       .remove = __devexit_p(ar7_wdt_remove),
+       .remove = ar7_wdt_remove,
        .shutdown = ar7_wdt_shutdown,
        .driver = {
                .owner = THIS_MODULE,

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 7ef99a169e3bbaf6e433abe4a7591b576a35ad75..75f3a6bc323ba75d52a156476f0b16e9a9b5b54e 100644 (file)
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -254,7 +254,7 @@ static int at91wdt_resume(struct platform_device *pdev)
 
 static struct platform_driver at91wdt_driver = {
        .probe          = at91wdt_probe,
-       .remove         = __devexit_p(at91wdt_remove),
+       .remove         = at91wdt_remove,
        .shutdown       = at91wdt_shutdown,
        .suspend        = at91wdt_suspend,
        .resume         = at91wdt_resume,

diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 1f9371f49c402c71422edc364871fa8c3bf9c149..367ef5ed19b7cbb9cfc89222018617ac1f943c60 100644 (file)
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -284,7 +284,7 @@ static void ath97_wdt_shutdown(struct platform_device *pdev)
 }
 
 static struct platform_driver ath79_wdt_driver = {
-       .remove         = __devexit_p(ath79_wdt_remove),
+       .remove         = ath79_wdt_remove,
        .shutdown       = ath97_wdt_shutdown,
        .driver         = {
                .name   = DRIVER_NAME,

diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index 551880bfd629c8043fa6459cb2ae969b3a0b2d47..e81b78444fa9cb48a57ecd380a0535497953e874 100644 (file)
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
@@ -304,7 +304,7 @@ static void bcm63xx_wdt_shutdown(struct platform_device *pdev)
 
 static struct platform_driver bcm63xx_wdt_driver = {
        .probe  = bcm63xx_wdt_probe,
-       .remove = __devexit_p(bcm63xx_wdt_remove),
+       .remove = bcm63xx_wdt_remove,
        .shutdown = bcm63xx_wdt_shutdown,
        .driver = {
                .owner = THIS_MODULE,

diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 38bc383e0677228abbfd3109cd1774e0c32e31e7..4a85dbf5aec035ecd4e2024a0d1c519797b0a200 100644 (file)
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -401,7 +401,7 @@ static struct platform_device *bfin_wdt_device;
 
 static struct platform_driver bfin_wdt_driver = {
        .probe     = bfin_wdt_probe,
-       .remove    = __devexit_p(bfin_wdt_remove),
+       .remove    = bfin_wdt_remove,
        .shutdown  = bfin_wdt_shutdown,
        .suspend   = bfin_wdt_suspend,
        .resume    = bfin_wdt_resume,

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 95b1b954de1bb336076c44a564f0682be87233ed..ed7f434bba79ad294a51b55ca39e2a742c219a28 100644 (file)
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -684,7 +684,7 @@ static struct platform_driver cpwd_driver = {
                .of_match_table = cpwd_match,
        },
        .probe          = cpwd_probe,
-       .remove         = __devexit_p(cpwd_remove),
+       .remove         = cpwd_remove,
 };
 
 module_platform_driver(cpwd_driver);

diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index f7abbaeebcaf51466efbc493c2fb433b01408bf3..463e9e55b5604c0aa67cc2784dc036b4f1b8d750 100644 (file)
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -236,7 +236,7 @@ static int __devexit da9052_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_wdt_driver = {
        .probe = da9052_wdt_probe,
-       .remove = __devexit_p(da9052_wdt_remove),
+       .remove = da9052_wdt_remove,
        .driver = {
                .name   = "da9052-watchdog",
        },

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index c8c5c8032bcb61f763517cb688b37de98a6deb68..ea4e96259a82d27e6fde1272e7ba92f402416986 100644 (file)
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -268,7 +268,7 @@ static struct platform_driver platform_wdt_driver = {
                .owner  = THIS_MODULE,
        },
        .probe = davinci_wdt_probe,
-       .remove = __devexit_p(davinci_wdt_remove),
+       .remove = davinci_wdt_remove,
 };
 
 module_platform_driver(platform_wdt_driver);

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 06de1211a444db37244e5f180c4aa926af349b86..6a8448dcc20e41c5ce7b321c70ee3d3988be8bde 100644 (file)
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -345,7 +345,7 @@ static int __devexit dw_wdt_drv_remove(struct platform_device *pdev)
 
 static struct platform_driver dw_wdt_driver = {
        .probe          = dw_wdt_drv_probe,
-       .remove         = __devexit_p(dw_wdt_drv_remove),
+       .remove         = dw_wdt_drv_remove,
        .driver         = {
                .name   = "dw_wdt",
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 77050037597a08603c1cbbe6d0e6cf9acb32efee..91703a58145db5af873ca9e8e6494174b7bb9912 100644 (file)
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -168,7 +168,7 @@ static struct platform_driver ep93xx_wdt_driver = {
                .name   = "ep93xx-wdt",
        },
        .probe          = ep93xx_wdt_probe,
-       .remove         = __devexit_p(ep93xx_wdt_remove),
+       .remove         = ep93xx_wdt_remove,
 };
 
 module_platform_driver(ep93xx_wdt_driver);

diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index dc563b680abdf3bb13909be403fd4472cacf5978..a340e04f2379c01fb4b0f35c3cd8a2e0f92aa516 100644 (file)
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -256,7 +256,7 @@ static void geodewdt_shutdown(struct platform_device *dev)
 
 static struct platform_driver geodewdt_driver = {
        .probe          = geodewdt_probe,
-       .remove         = __devexit_p(geodewdt_remove),
+       .remove         = geodewdt_remove,
        .shutdown       = geodewdt_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index ae60406ea8a1878cefd03d29868eda31b955578f..03687bcc74f223a53a96f2dc2c6bae9f439c3260 100644 (file)
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -863,7 +863,7 @@ static struct pci_driver hpwdt_driver = {
        .name = "hpwdt",
        .id_table = hpwdt_devices,
        .probe = hpwdt_init_one,
-       .remove = __devexit_p(hpwdt_exit),
+       .remove = hpwdt_exit,
 };
 
 MODULE_AUTHOR("Tom Mingarelli");

diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 276877d5b6a3f538c430d366d6b0905cbf4cf2d3..2574066c6343e2aab5c7b0f01a784bf4ecadfb91 100644 (file)
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -488,7 +488,7 @@ static struct pci_driver esb_driver = {
        .name           = ESB_MODULE_NAME,
        .id_table       = esb_pci_tbl,
        .probe          = esb_probe,
-       .remove         = __devexit_p(esb_remove),
+       .remove         = esb_remove,
        .shutdown       = esb_shutdown,
 };
 

diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 545d387de411bbd112a7be360f0c4efcd263c34c..b83f935f6d4d9b2c2bb01ed9f571f22ac17e3328 100644 (file)
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -548,7 +548,7 @@ static void iTCO_wdt_shutdown(struct platform_device *dev)
 
 static struct platform_driver iTCO_wdt_driver = {
        .probe          = iTCO_wdt_probe,
-       .remove         = __devexit_p(iTCO_wdt_remove),
+       .remove         = iTCO_wdt_remove,
        .shutdown       = iTCO_wdt_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 184c0bfc87a42f5f061e0e316a792260cb67a014..4e992c87741c4059ca7e935df8a3d01c2dfb9909 100644 (file)
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -337,7 +337,7 @@ static void ibwdt_shutdown(struct platform_device *dev)
 
 static struct platform_driver ibwdt_driver = {
        .probe          = ibwdt_probe,
-       .remove         = __devexit_p(ibwdt_remove),
+       .remove         = ibwdt_remove,
        .shutdown       = ibwdt_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c
index 8f541b94005313367b2c57f9c0e209cd3cff7a9d..93b2cda2f8ddba039a1f7789ed4c2ae9b226591c 100644 (file)
--- a/drivers/watchdog/ie6xx_wdt.c
+++ b/drivers/watchdog/ie6xx_wdt.c
@@ -311,7 +311,7 @@ static int __devexit ie6xx_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver ie6xx_wdt_driver = {
        .probe          = ie6xx_wdt_probe,
-       .remove         = __devexit_p(ie6xx_wdt_remove),
+       .remove         = ie6xx_wdt_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 978615ef899d5e52dfb403dd583762fa5cd5fbae..331a61340fe8c3245573231c95e90730524ba7a0 100644 (file)
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -210,7 +210,7 @@ static int __devexit jz4740_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver jz4740_wdt_driver = {
        .probe = jz4740_wdt_probe,
-       .remove = __devexit_p(jz4740_wdt_remove),
+       .remove = jz4740_wdt_remove,
        .driver = {
                .name = "jz4740-wdt",
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index c1a4d3bf581d22ea7b760f7c8525dfba4b7f35ba..6ac9ff2493f6bfd73232ef961d5ab20e787a7645 100644 (file)
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -290,7 +290,7 @@ static int ks8695wdt_resume(struct platform_device *pdev)
 
 static struct platform_driver ks8695wdt_driver = {
        .probe          = ks8695wdt_probe,
-       .remove         = __devexit_p(ks8695wdt_remove),
+       .remove         = ks8695wdt_remove,
        .shutdown       = ks8695wdt_shutdown,
        .suspend        = ks8695wdt_suspend,
        .resume         = ks8695wdt_resume,

diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c
index 2e74c3a8ee5840ff405ded8932f32c6be6ea9d3e..ce4df083d7faaa1c8c88d7372887229621c6f8ec 100644 (file)
--- a/drivers/watchdog/lantiq_wdt.c
+++ b/drivers/watchdog/lantiq_wdt.c
@@ -236,7 +236,7 @@ MODULE_DEVICE_TABLE(of, ltq_wdt_match);
 
 static struct platform_driver ltq_wdt_driver = {
        .probe = ltq_wdt_probe,
-       .remove = __devexit_p(ltq_wdt_remove),
+       .remove = ltq_wdt_remove,
        .driver = {
                .name = "wdt",
                .owner = THIS_MODULE,

diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index 8f4a74e91619fd693c651e7c391538a169a3dd23..7e952217cf6bdbb798c87b9c6af563c365d2e6d8 100644 (file)
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -228,7 +228,7 @@ MODULE_DEVICE_TABLE(platform, max63xx_id_table);
 
 static struct platform_driver max63xx_wdt_driver = {
        .probe          = max63xx_wdt_probe,
-       .remove         = __devexit_p(max63xx_wdt_remove),
+       .remove         = max63xx_wdt_remove,
        .id_table       = max63xx_id_table,
        .driver         = {
                .name   = "max63xx_wdt",

diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index e6a038ae8dc28bf6c64a6311e886b6afa8853db8..e44d6d9c1f35b7ea150bd44b530a06511882b4be 100644 (file)
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -281,7 +281,7 @@ MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match);
 
 static struct platform_driver mpc8xxx_wdt_driver = {
        .probe          = mpc8xxx_wdt_probe,
-       .remove         = __devexit_p(mpc8xxx_wdt_remove),
+       .remove         = mpc8xxx_wdt_remove,
        .driver = {
                .name = "mpc8xxx_wdt",
                .owner = THIS_MODULE,

diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 7c741dc987bd5058904dc03502bf169512db4db2..cf66cee3595661410740522e42ef8bcd9643083f 100644 (file)
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -415,7 +415,7 @@ MODULE_ALIAS("platform:mpcore_wdt");
 
 static struct platform_driver mpcore_wdt_driver = {
        .probe          = mpcore_wdt_probe,
-       .remove         = __devexit_p(mpcore_wdt_remove),
+       .remove         = mpcore_wdt_remove,
        .suspend        = mpcore_wdt_suspend,
        .resume         = mpcore_wdt_resume,
        .shutdown       = mpcore_wdt_shutdown,

diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index c29e31d99fe846ae63479c3ae22f9bffa705056d..5474a06ad607227c0ed87ea00b8aa51087e02cc3 100644 (file)
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -248,7 +248,7 @@ static int __devexit mtx1_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver mtx1_wdt_driver = {
        .probe = mtx1_wdt_probe,
-       .remove = __devexit_p(mtx1_wdt_remove),
+       .remove = mtx1_wdt_remove,
        .driver.name = "mtx1-wdt",
        .driver.owner = THIS_MODULE,
 };

diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index c53d025e70dfce053b6f05835d737605fa7f4669..7d37da5522bb1196eef5bcadabc935a32585f93c 100644 (file)
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -300,7 +300,7 @@ static int __devexit mv64x60_wdt_remove(struct platform_device *dev)
 
 static struct platform_driver mv64x60_wdt_driver = {
        .probe = mv64x60_wdt_probe,
-       .remove = __devexit_p(mv64x60_wdt_remove),
+       .remove = mv64x60_wdt_remove,
        .driver = {
                .owner = THIS_MODULE,
                .name = MV64x60_WDT_NAME,

diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index ea4c7448b7547255d2c922232d6f529a1be6fc76..a77f6900917d2c410ada24f28c8d5f5fb451e4a5 100644 (file)
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -328,7 +328,7 @@ static int __devexit nuc900wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver nuc900wdt_driver = {
        .probe          = nuc900wdt_probe,
-       .remove         = __devexit_p(nuc900wdt_remove),
+       .remove         = nuc900wdt_remove,
        .driver         = {
                .name   = "nuc900-wdt",
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index 6bbb9efc61250ab28eeabcc8441e50a281b9ef16..e0d4496c2811d77becb988e55b95d6a500c94dda 100644 (file)
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -468,7 +468,7 @@ static void nv_tco_shutdown(struct platform_device *dev)
 
 static struct platform_driver nv_tco_driver = {
        .probe          = nv_tco_init,
-       .remove         = __devexit_p(nv_tco_remove),
+       .remove         = nv_tco_remove,
        .shutdown       = nv_tco_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index 294fb4e005219c2ee916d6b04bfce958cab714fb..df8c5f3f3674f0c03aaae56e88b70c905a01e47b 100644 (file)
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -401,7 +401,7 @@ MODULE_DEVICE_TABLE(of, xwdt_of_match);
 
 static struct platform_driver xwdt_driver = {
        .probe       = xwdt_probe,
-       .remove      = __devexit_p(xwdt_remove),
+       .remove      = xwdt_remove,
        .driver = {
                .owner = THIS_MODULE,
                .name  = WATCHDOG_NAME,

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index f5db18dbc0f9e5e9092462142aa805a87239d696..1596a5da34636ffee3c386055871cd6d3fd4dbee 100644 (file)
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -426,7 +426,7 @@ MODULE_DEVICE_TABLE(of, omap_wdt_of_match);
 
 static struct platform_driver omap_wdt_driver = {
        .probe          = omap_wdt_probe,
-       .remove         = __devexit_p(omap_wdt_remove),
+       .remove         = omap_wdt_remove,
        .shutdown       = omap_wdt_shutdown,
        .suspend        = omap_wdt_suspend,
        .resume         = omap_wdt_resume,

diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index c20f96b579d92015f394cc883ad632fe1443f69b..33a0872ab47078ab1e068fd738ee46fdcb48341f 100644 (file)
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -201,7 +201,7 @@ MODULE_DEVICE_TABLE(of, orion_wdt_of_match_table);
 
 static struct platform_driver orion_wdt_driver = {
        .probe          = orion_wdt_probe,
-       .remove         = __devexit_p(orion_wdt_remove),
+       .remove         = orion_wdt_remove,
        .shutdown       = orion_wdt_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c
index 75694cf24f86713830dd3075cadea5666cdc84be..df454c9b52749d3858b18df86eef4aca423c3fee 100644 (file)
--- a/drivers/watchdog/pcwd.c
+++ b/drivers/watchdog/pcwd.c
@@ -984,7 +984,7 @@ static void pcwd_isa_shutdown(struct device *dev, unsigned int id)
 static struct isa_driver pcwd_isa_driver = {
        .match          = pcwd_isa_match,
        .probe          = pcwd_isa_probe,
-       .remove         = __devexit_p(pcwd_isa_remove),
+       .remove         = pcwd_isa_remove,
        .shutdown       = pcwd_isa_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index ee6900da8678720dcbfb62251e48483ec7325ba6..1407a6fd077ba9c23534f27fb48d0db3f2aa059b 100644 (file)
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -812,7 +812,7 @@ static struct pci_driver pcipcwd_driver = {
        .name           = WATCHDOG_NAME,
        .id_table       = pcipcwd_pci_tbl,
        .probe          = pcipcwd_card_init,
-       .remove         = __devexit_p(pcipcwd_card_exit),
+       .remove         = pcipcwd_card_exit,
 };
 
 module_pci_driver(pcipcwd_driver);

diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 87722e1260581ca27a9f8b7b1c34098611ec6022..5c07fa47b8ce8c29598052f613f45f44b1301ea7 100644 (file)
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -217,7 +217,7 @@ static struct platform_driver platform_wdt_driver = {
                .of_match_table = of_match_ptr(pnx4008_wdt_match),
        },
        .probe = pnx4008_wdt_probe,
-       .remove = __devexit_p(pnx4008_wdt_remove),
+       .remove = pnx4008_wdt_remove,
 };
 
 module_platform_driver(platform_wdt_driver);

diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index 547353a50ebb017c77d8b5ea7f64bf0521377bd3..cf983d3a32fefe34149bfa72630aeac91f9100e9 100644 (file)
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -320,7 +320,7 @@ static void rc32434_wdt_shutdown(struct platform_device *pdev)
 
 static struct platform_driver rc32434_wdt_driver = {
        .probe          = rc32434_wdt_probe,
-       .remove         = __devexit_p(rc32434_wdt_remove),
+       .remove         = rc32434_wdt_remove,
        .shutdown       = rc32434_wdt_shutdown,
        .driver         = {
                        .name = "rc32434_wdt",

diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 042ccc56ae26f34dad5f6ef2dbe1327d47cc56bf..27682148c99e158c6b9c1b8f68e5f9dbf2287f7c 100644 (file)
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -286,7 +286,7 @@ static int __devexit rdc321x_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver rdc321x_wdt_driver = {
        .probe = rdc321x_wdt_probe,
-       .remove = __devexit_p(rdc321x_wdt_remove),
+       .remove = rdc321x_wdt_remove,
        .driver = {
                .owner = THIS_MODULE,
                .name = "rdc321x-wdt",

diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 49e1b1c2135cdde2c00bfd37978c02d8ce62cfd1..65851f4553c489bfd5b684b6cd4e04d63c3aeff5 100644 (file)
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -246,7 +246,7 @@ static struct platform_driver riowd_driver = {
                .of_match_table = riowd_match,
        },
        .probe          = riowd_probe,
-       .remove         = __devexit_p(riowd_remove),
+       .remove         = riowd_remove,
 };
 
 module_platform_driver(riowd_driver);

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 9245b4d23bfe79ead0116c440fb6f4803fa23221..c31742096932705722b8758d600382eec7577a1f 100644 (file)
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -508,7 +508,7 @@ MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
 
 static struct platform_driver s3c2410wdt_driver = {
        .probe          = s3c2410wdt_probe,
-       .remove         = __devexit_p(s3c2410wdt_remove),
+       .remove         = s3c2410wdt_remove,
        .shutdown       = s3c2410wdt_shutdown,
        .suspend        = s3c2410wdt_suspend,
        .resume         = s3c2410wdt_resume,

diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index 9681ada0f252fd774664ed012485d84cc9f0adeb..766b132e8c6eaed7e8b7d30408e0923a6205605a 100644 (file)
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -451,7 +451,7 @@ static void sch311x_wdt_shutdown(struct platform_device *dev)
 
 static struct platform_driver sch311x_wdt_driver = {
        .probe          = sch311x_wdt_probe,
-       .remove         = __devexit_p(sch311x_wdt_remove),
+       .remove         = sch311x_wdt_remove,
        .shutdown       = sch311x_wdt_shutdown,
        .driver         = {
                .owner = THIS_MODULE,

diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index e5b59bebcdb1a7f9da15376aa4d6a3423d27e1e7..ce1be6eca6403a18641dc8596f379336208a124d 100644 (file)
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -324,7 +324,7 @@ static struct platform_driver sh_wdt_driver = {
        },
 
        .probe          = sh_wdt_probe,
-       .remove         = __devexit_p(sh_wdt_remove),
+       .remove         = sh_wdt_remove,
        .shutdown       = sh_wdt_shutdown,
 };
 

diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
index ae5e82cb83fa80bb897aaf4131aee42616add6c1..066901bdc4d52d41809f46115a0b6fa42bd7dcbd 100644 (file)
--- a/drivers/watchdog/sp5100_tco.c
+++ b/drivers/watchdog/sp5100_tco.c
@@ -439,7 +439,7 @@ static void sp5100_tco_shutdown(struct platform_device *dev)
 
 static struct platform_driver sp5100_tco_driver = {
        .probe          = sp5100_tco_init,
-       .remove         = __devexit_p(sp5100_tco_remove),
+       .remove         = sp5100_tco_remove,
        .shutdown       = sp5100_tco_shutdown,
        .driver         = {
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index e4841c36798bd758d9a037f8d89de467047d88ae..f1c1e889e4192345aac285d8cdea18985e88bf30 100644 (file)
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -326,7 +326,7 @@ static struct amba_driver sp805_wdt_driver = {
        },
        .id_table       = sp805_wdt_ids,
        .probe          = sp805_wdt_probe,
-       .remove = __devexit_p(sp805_wdt_remove),
+       .remove = sp805_wdt_remove,
 };
 
 module_amba_driver(sp805_wdt_driver);

diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
index 21d96b92bfd7b084e722028307926281dc93fa39..4226250eb6e47cda2e01f95416bec35d46a38bd3 100644 (file)
--- a/drivers/watchdog/stmp3xxx_wdt.c
+++ b/drivers/watchdog/stmp3xxx_wdt.c
@@ -269,7 +269,7 @@ static struct platform_driver platform_wdt_driver = {
                .name = "stmp3xxx_wdt",
        },
        .probe = stmp3xxx_wdt_probe,
-       .remove = __devexit_p(stmp3xxx_wdt_remove),
+       .remove = stmp3xxx_wdt_remove,
        .suspend = stmp3xxx_wdt_suspend,
        .resume = stmp3xxx_wdt_resume,
 };

diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index 8df050d800e63e2b8467fbab6307ee8e511cb074..2acc1fe7f54de04632da2e57bdde4aba3f1032b8 100644 (file)
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -499,7 +499,7 @@ static __devexit int ts72xx_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver ts72xx_wdt_driver = {
        .probe          = ts72xx_wdt_probe,
-       .remove         = __devexit_p(ts72xx_wdt_remove),
+       .remove         = ts72xx_wdt_remove,
        .driver         = {
                .name   = "ts72xx-wdt",
                .owner  = THIS_MODULE,

diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 249f11305d263797d2863d1873f3252fd2ed8bd8..cf59a38478e0ef8bc4e4b451d485229b3a01083d 100644 (file)
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -247,7 +247,7 @@ static int twl4030_wdt_resume(struct platform_device *pdev)
 
 static struct platform_driver twl4030_wdt_driver = {
        .probe          = twl4030_wdt_probe,
-       .remove         = __devexit_p(twl4030_wdt_remove),
+       .remove         = twl4030_wdt_remove,
        .suspend        = twl4030_wdt_suspend,
        .resume         = twl4030_wdt_resume,
        .driver         = {

diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index aa50da3ccfe3678f8a740eab41abcb61e7beefef..a9af1ddae1bac9335a1f0a83a6633138dc48a1de 100644 (file)
--- a/drivers/watchdog/via_wdt.c
+++ b/drivers/watchdog/via_wdt.c
@@ -250,7 +250,7 @@ static struct pci_driver wdt_driver = {
        .name           = "via_wdt",
        .id_table       = wdt_pci_table,
        .probe          = wdt_probe,
-       .remove         = __devexit_p(wdt_remove),
+       .remove         = wdt_remove,
 };
 
 module_pci_driver(wdt_driver);

diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index e32654efdbb6f30f36595051f54c432e73c0b1b3..05c14e4740c175ac8bce1f6f15d35e98d8efa986 100644 (file)
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -736,7 +736,7 @@ static struct pci_driver wdtpci_driver = {
        .name           = "wdt_pci",
        .id_table       = wdtpci_pci_tbl,
        .probe          = wdtpci_init_one,
-       .remove         = __devexit_p(wdtpci_remove_one),
+       .remove         = wdtpci_remove_one,
 };
 
 module_pci_driver(wdtpci_driver);

diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index 87d66d236c3e668c33936f0abbc156dc43d7489d..f9c54feb8f1a8aed5d36649d6bca7411ea1fbf33 100644 (file)
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -306,7 +306,7 @@ static int __devexit wm831x_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_wdt_driver = {
        .probe = wm831x_wdt_probe,
-       .remove = __devexit_p(wm831x_wdt_remove),
+       .remove = wm831x_wdt_remove,
        .driver = {
                .name = "wm831x-watchdog",
        },

diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c
index 3c76693447fd5483ba01934e619afe74320f1e86..770b6da1ff418a7690b534efa137335d019ffdd3 100644 (file)
--- a/drivers/watchdog/wm8350_wdt.c
+++ b/drivers/watchdog/wm8350_wdt.c
@@ -166,7 +166,7 @@ static int __devexit wm8350_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver wm8350_wdt_driver = {
        .probe = wm8350_wdt_probe,
-       .remove = __devexit_p(wm8350_wdt_remove),
+       .remove = wm8350_wdt_remove,
        .driver = {
                .name = "wm8350-wdt",
        },

diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c
index e4a25b51165c0f5933858e5fe0068a5a7da106b7..99b956fa4ebd329feb5b2f9b01a7b58f0ab109ed 100644 (file)
--- a/drivers/watchdog/xen_wdt.c
+++ b/drivers/watchdog/xen_wdt.c
@@ -315,7 +315,7 @@ static int xen_wdt_resume(struct platform_device *dev)
 
 static struct platform_driver xen_wdt_driver = {
        .probe          = xen_wdt_probe,
-       .remove         = __devexit_p(xen_wdt_remove),
+       .remove         = xen_wdt_remove,
        .shutdown       = xen_wdt_shutdown,
        .suspend        = xen_wdt_suspend,
        .resume         = xen_wdt_resume,