leds: 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: Richard Purdie <rpurdie@rpsys.net>
Cc: Jan-Simon Moeller <jansimon.moeller@gmx.de>
Acked-by: Bryan Wu <cooloney@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
index aa56a867693afebfcdfc2dd49b739dd37c9029ae..e068802f522295f5d25a5cfd4a13ed35635d4449 100644 (file)
--- a/drivers/leds/leds-adp5520.c
+++ b/drivers/leds/leds-adp5520.c
@@ -208,7 +208,7 @@ static struct platform_driver adp5520_led_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = adp5520_led_probe,
-       .remove         = __devexit_p(adp5520_led_remove),
+       .remove         = adp5520_led_remove,
 };
 
 module_platform_driver(adp5520_led_driver);

diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
index 5de74ff90dcf3ffddb4ba22b5ed94976f59f9ffc..ec601e2e92dcd4d823cf180649308b3c6ed202a9 100644 (file)
--- a/drivers/leds/leds-asic3.c
+++ b/drivers/leds/leds-asic3.c
@@ -167,7 +167,7 @@ static const struct dev_pm_ops asic3_led_pm_ops = {
 
 static struct platform_driver asic3_led_driver = {
        .probe          = asic3_led_probe,
-       .remove         = __devexit_p(asic3_led_remove),
+       .remove         = asic3_led_remove,
        .driver         = {
                .name   = "leds-asic3",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
index f7c3d7f1ec527fcb3950a3dbd8da26efc48ca00a..92a2c1f696f59f04128a6ae95f67b75cb78e4363 100644 (file)
--- a/drivers/leds/leds-blinkm.c
+++ b/drivers/leds/leds-blinkm.c
@@ -801,7 +801,7 @@ static struct i2c_driver blinkm_driver = {
                   .name = "blinkm",
                   },
        .probe = blinkm_probe,
-       .remove = __devexit_p(blinkm_remove),
+       .remove = blinkm_remove,
        .id_table = blinkm_id,
        .detect = blinkm_detect,
        .address_list = normal_i2c,

diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
index 6a8725cc7b4dfe119a2083e37e1290198bdbdd24..cdf00652dd555135bf275219beb5fb7eefc4a727 100644 (file)
--- a/drivers/leds/leds-cobalt-qube.c
+++ b/drivers/leds/leds-cobalt-qube.c
@@ -77,7 +77,7 @@ static int __devexit cobalt_qube_led_remove(struct platform_device *pdev)
 
 static struct platform_driver cobalt_qube_led_driver = {
        .probe  = cobalt_qube_led_probe,
-       .remove = __devexit_p(cobalt_qube_led_remove),
+       .remove = cobalt_qube_led_remove,
        .driver = {
                .name   = "cobalt-qube-leds",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c
index aac1c073fe7bb20b018553c7e5c89e0fe084a8cc..0894e89d43fdbec3e486dc3dc5dc5625db0d5df6 100644 (file)
--- a/drivers/leds/leds-cobalt-raq.c
+++ b/drivers/leds/leds-cobalt-raq.c
@@ -124,7 +124,7 @@ static int __devexit cobalt_raq_led_remove(struct platform_device *pdev)
 
 static struct platform_driver cobalt_raq_led_driver = {
        .probe  = cobalt_raq_led_probe,
-       .remove = __devexit_p(cobalt_raq_led_remove),
+       .remove = cobalt_raq_led_remove,
        .driver = {
                .name   = "cobalt-raq-leds",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index cc77c9d926159724a8e580e109ef488e138b7cdb..de08c9312af06b921459ece04c2de0b003e0f174 100644 (file)
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -150,7 +150,7 @@ static struct platform_driver da903x_led_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = da903x_led_probe,
-       .remove         = __devexit_p(da903x_led_remove),
+       .remove         = da903x_led_remove,
 };
 
 module_platform_driver(da903x_led_driver);

diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c
index 58a5244c437e94661515243089299c7fd4b30747..0df968cf0599c1c3759751b49c12ed2e81b119cf 100644 (file)
--- a/drivers/leds/leds-da9052.c
+++ b/drivers/leds/leds-da9052.c
@@ -204,7 +204,7 @@ static struct platform_driver da9052_led_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = da9052_led_probe,
-       .remove         = __devexit_p(da9052_led_remove),
+       .remove         = da9052_led_remove,
 };
 
 module_platform_driver(da9052_led_driver);

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 087d1e66f4f76e754aea4d21a149e7eb8633a060..51bc51311de03c7660a9c19b9e100338a3fe1799 100644 (file)
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -288,7 +288,7 @@ static int __devexit gpio_led_remove(struct platform_device *pdev)
 
 static struct platform_driver gpio_led_driver = {
        .probe          = gpio_led_probe,
-       .remove         = __devexit_p(gpio_led_remove),
+       .remove         = gpio_led_remove,
        .driver         = {
                .name   = "leds-gpio",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index b26306f6724dcebc1605625405625aeebe022298..5ac59e1f33343988ada9dbedeb8a6cb649491ada 100644 (file)
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -472,7 +472,7 @@ MODULE_DEVICE_TABLE(i2c, lm3530_id);
 
 static struct i2c_driver lm3530_i2c_driver = {
        .probe = lm3530_probe,
-       .remove = __devexit_p(lm3530_remove),
+       .remove = lm3530_remove,
        .id_table = lm3530_id,
        .driver = {
                .name = LM3530_NAME,

diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
index f6837b99908c46f6c963383aafb53a5c8e602198..be246bf32e2d2690124b32d56a94c589c26d8037 100644 (file)
--- a/drivers/leds/leds-lm3533.c
+++ b/drivers/leds/leds-lm3533.c
@@ -774,7 +774,7 @@ static struct platform_driver lm3533_led_driver = {
                .owner = THIS_MODULE,
        },
        .probe          = lm3533_led_probe,
-       .remove         = __devexit_p(lm3533_led_remove),
+       .remove         = lm3533_led_remove,
        .shutdown       = lm3533_led_shutdown,
 };
 module_platform_driver(lm3533_led_driver);

diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c
index 065ec015d67a0e95d6d16107849ec0ddeb25811f..307d7b960809bbf4a16bf2484541f8c9eb003740 100644 (file)
--- a/drivers/leds/leds-lm355x.c
+++ b/drivers/leds/leds-lm355x.c
@@ -560,7 +560,7 @@ static struct i2c_driver lm355x_i2c_driver = {
                   .pm = NULL,
                   },
        .probe = lm355x_probe,
-       .remove = __devexit_p(lm355x_remove),
+       .remove = lm355x_remove,
        .id_table = lm355x_id,
 };
 

diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c
index 3285006e988820ebb763ef47709842549d6bad5e..cae0b7017cbbeda5170b2348439fda97d8f42114 100644 (file)
--- a/drivers/leds/leds-lm3642.c
+++ b/drivers/leds/leds-lm3642.c
@@ -450,7 +450,7 @@ static struct i2c_driver lm3642_i2c_driver = {
                   .pm = NULL,
                   },
        .probe = lm3642_probe,
-       .remove = __devexit_p(lm3642_remove),
+       .remove = lm3642_remove,
        .id_table = lm3642_id,
 };
 

diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c
index c298f7d9f5357eb27fe302c2a96d906b2ab38b66..aa74b797a2fa006bc9d70932717e4e23d5c95f65 100644 (file)
--- a/drivers/leds/leds-lp3944.c
+++ b/drivers/leds/leds-lp3944.c
@@ -446,7 +446,7 @@ static struct i2c_driver lp3944_driver = {
                   .name = "lp3944",
        },
        .probe    = lp3944_probe,
-       .remove   = __devexit_p(lp3944_remove),
+       .remove   = lp3944_remove,
        .id_table = lp3944_id,
 };
 

diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 2064aefedc0707fd7a6d78e85ded09dd441113a0..d633ecf5868749ef7d056552a6b4f12b7e5fd181 100644 (file)
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -886,7 +886,7 @@ static struct i2c_driver lp5521_driver = {
                .name   = "lp5521",
        },
        .probe          = lp5521_probe,
-       .remove         = __devexit_p(lp5521_remove),
+       .remove         = lp5521_remove,
        .id_table       = lp5521_id,
 };
 

diff --git a/drivers/leds/leds-lp8788.c b/drivers/leds/leds-lp8788.c
index 64009a176651984343c6ce7fc7c55c819d50aa25..fbcfc1b821f80e22ebf42f56570e4dd3f6fbe41d 100644 (file)
--- a/drivers/leds/leds-lp8788.c
+++ b/drivers/leds/leds-lp8788.c
@@ -179,7 +179,7 @@ static int __devexit lp8788_led_remove(struct platform_device *pdev)
 
 static struct platform_driver lp8788_led_driver = {
        .probe = lp8788_led_probe,
-       .remove = __devexit_p(lp8788_led_remove),
+       .remove = lp8788_led_remove,
        .driver = {
                .name = LP8788_DEV_KEYLED,
                .owner = THIS_MODULE,

diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
index 09a732217f6d96fd3b554d85b6127201da8db6b5..40657420cfc5e025dc18f88bf3ed63e37f469be8 100644 (file)
--- a/drivers/leds/leds-lt3593.c
+++ b/drivers/leds/leds-lt3593.c
@@ -189,7 +189,7 @@ static int __devexit lt3593_led_remove(struct platform_device *pdev)
 
 static struct platform_driver lt3593_led_driver = {
        .probe          = lt3593_led_probe,
-       .remove         = __devexit_p(lt3593_led_remove),
+       .remove         = lt3593_led_remove,
        .driver         = {
                .name   = "leds-lt3593",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-max8997.c b/drivers/leds/leds-max8997.c
index 569e36de37dfe4963ff36993c0bab05b99402270..b11a5a72bc3e36d7aed87f071feae6892f83b064 100644 (file)
--- a/drivers/leds/leds-max8997.c
+++ b/drivers/leds/leds-max8997.c
@@ -308,7 +308,7 @@ static struct platform_driver max8997_led_driver = {
                .owner = THIS_MODULE,
        },
        .probe  = max8997_led_probe,
-       .remove = __devexit_p(max8997_led_remove),
+       .remove = max8997_led_remove,
 };
 
 module_platform_driver(max8997_led_driver);

diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index 2a5d43400677c4947cfebd054516c226693f9d32..e760b0754ff143abfbe8bed7d45e6527ddb2e4f2 100644 (file)
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -381,7 +381,7 @@ static struct platform_driver mc13783_led_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = mc13783_led_probe,
-       .remove         = __devexit_p(mc13783_led_remove),
+       .remove         = mc13783_led_remove,
 };
 
 module_platform_driver(mc13783_led_driver);

diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index 461bbf9b33fa03a4acd10c51a4edcdbbbd0368e8..b3c0377b51fbf7664822c4934b31dea4128ac36c 100644 (file)
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -407,7 +407,7 @@ static int __devexit netxbig_led_remove(struct platform_device *pdev)
 
 static struct platform_driver netxbig_led_driver = {
        .probe          = netxbig_led_probe,
-       .remove         = __devexit_p(netxbig_led_remove),
+       .remove         = netxbig_led_remove,
        .driver         = {
                .name   = "leds-netxbig",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index d176ec83f5d9bd84b72aaf7e7797b36d5441353c..89c8b47b47947a7c2939dcd621baa784b2459f4c 100644 (file)
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -310,7 +310,7 @@ static int __devexit ns2_led_remove(struct platform_device *pdev)
 
 static struct platform_driver ns2_led_driver = {
        .probe          = ns2_led_probe,
-       .remove         = __devexit_p(ns2_led_remove),
+       .remove         = ns2_led_remove,
        .driver         = {
                .name   = "leds-ns2",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-ot200.c b/drivers/leds/leds-ot200.c
index c4646825a620bb31940cd02e64d1ac753a08d0b0..92521789067775ec4920b6a75a9fbf6efbc8e5d5 100644 (file)
--- a/drivers/leds/leds-ot200.c
+++ b/drivers/leds/leds-ot200.c
@@ -156,7 +156,7 @@ static int __devexit ot200_led_remove(struct platform_device *pdev)
 
 static struct platform_driver ot200_led_driver = {
        .probe          = ot200_led_probe,
-       .remove         = __devexit_p(ot200_led_remove),
+       .remove         = ot200_led_remove,
        .driver         = {
                .name   = "leds-ot200",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index aef3cf0432fe7ba1374e9b4111fdd0c7ae1f9af1..12506e74a4c5ae363ba23c92e2f6bd9f324976ee 100644 (file)
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -382,7 +382,7 @@ static struct i2c_driver pca955x_driver = {
                .owner  = THIS_MODULE,
        },
        .probe  = pca955x_probe,
-       .remove = __devexit_p(pca955x_remove),
+       .remove = pca955x_remove,
        .id_table = pca955x_id,
 };
 

diff --git a/drivers/leds/leds-pca9633.c b/drivers/leds/leds-pca9633.c
index 2f2f9c43535dcb1c3940178c6b56e4f6280ba831..0685f343ff181a0d9797fc3535ff7045421685a3 100644 (file)
--- a/drivers/leds/leds-pca9633.c
+++ b/drivers/leds/leds-pca9633.c
@@ -183,7 +183,7 @@ static struct i2c_driver pca9633_driver = {
                .owner  = THIS_MODULE,
        },
        .probe  = pca9633_probe,
-       .remove = __devexit_p(pca9633_remove),
+       .remove = pca9633_remove,
        .id_table = pca9633_id,
 };
 

diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
index f2e44c7194374f135906fc3e9aa4ac87ca33a6bb..7a988f18522a93ecef8e79f30dd4489c945b7efc 100644 (file)
--- a/drivers/leds/leds-pwm.c
+++ b/drivers/leds/leds-pwm.c
@@ -125,7 +125,7 @@ static int __devexit led_pwm_remove(struct platform_device *pdev)
 
 static struct platform_driver led_pwm_driver = {
        .probe          = led_pwm_probe,
-       .remove         = __devexit_p(led_pwm_remove),
+       .remove         = led_pwm_remove,
        .driver         = {
                .name   = "leds_pwm",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-rb532.c b/drivers/leds/leds-rb532.c
index a7815b6cd8567d9dfd97ed9437f348d9cac4ebc8..e34f1ff4e8cec5abd64d73f37900b3adbc6e5747 100644 (file)
--- a/drivers/leds/leds-rb532.c
+++ b/drivers/leds/leds-rb532.c
@@ -50,7 +50,7 @@ static int __devexit rb532_led_remove(struct platform_device *pdev)
 
 static struct platform_driver rb532_led_driver = {
        .probe = rb532_led_probe,
-       .remove = __devexit_p(rb532_led_remove),
+       .remove = rb532_led_remove,
        .driver = {
                .name = "rb532-led",
                .owner = THIS_MODULE,

diff --git a/drivers/leds/leds-regulator.c b/drivers/leds/leds-regulator.c
index 25d382d60fa92cfe0f91ddfbc99920b5a2740a11..521af9b4e299f764519b0e54f39f97aef0bdeda9 100644 (file)
--- a/drivers/leds/leds-regulator.c
+++ b/drivers/leds/leds-regulator.c
@@ -223,7 +223,7 @@ static struct platform_driver regulator_led_driver = {
                   .owner = THIS_MODULE,
                   },
        .probe  = regulator_led_probe,
-       .remove = __devexit_p(regulator_led_remove),
+       .remove = regulator_led_remove,
 };
 
 module_platform_driver(regulator_led_driver);

diff --git a/drivers/leds/leds-renesas-tpu.c b/drivers/leds/leds-renesas-tpu.c
index 771ea067e680f8b64e9cd54672007a5d66091d9c..71cab56a67aa5bba7519cda29c5ac7088432d15b 100644 (file)
--- a/drivers/leds/leds-renesas-tpu.c
+++ b/drivers/leds/leds-renesas-tpu.c
@@ -328,7 +328,7 @@ static int __devexit r_tpu_remove(struct platform_device *pdev)
 
 static struct platform_driver r_tpu_device_driver = {
        .probe          = r_tpu_probe,
-       .remove         = __devexit_p(r_tpu_remove),
+       .remove         = r_tpu_remove,
        .driver         = {
                .name   = "leds-renesas-tpu",
        }

diff --git a/drivers/leds/leds-sunfire.c b/drivers/leds/leds-sunfire.c
index 134d9a4b34f18d66c4269927f21f088470c2de0f..3d35c5861146f59f648e486eda496d9dd4fecd5a 100644 (file)
--- a/drivers/leds/leds-sunfire.c
+++ b/drivers/leds/leds-sunfire.c
@@ -223,7 +223,7 @@ MODULE_ALIAS("platform:sunfire-fhc-leds");
 
 static struct platform_driver sunfire_clockboard_led_driver = {
        .probe          = sunfire_clockboard_led_probe,
-       .remove         = __devexit_p(sunfire_led_generic_remove),
+       .remove         = sunfire_led_generic_remove,
        .driver         = {
                .name   = "sunfire-clockboard-leds",
                .owner  = THIS_MODULE,
@@ -232,7 +232,7 @@ static struct platform_driver sunfire_clockboard_led_driver = {
 
 static struct platform_driver sunfire_fhc_led_driver = {
        .probe          = sunfire_fhc_led_probe,
-       .remove         = __devexit_p(sunfire_led_generic_remove),
+       .remove         = sunfire_led_generic_remove,
        .driver         = {
                .name   = "sunfire-fhc-leds",
                .owner  = THIS_MODULE,

diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index dabcf7ae8d0fd6369f6a4fa6142abc3de1d37be3..1172b4a264e8b4ccc192f5e37e1713a7b84683a6 100644 (file)
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -752,7 +752,7 @@ static struct i2c_driver tca6507_driver = {
                .owner   = THIS_MODULE,
        },
        .probe    = tca6507_probe,
-       .remove   = __devexit_p(tca6507_remove),
+       .remove   = tca6507_remove,
        .id_table = tca6507_id,
 };