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 aa56a86..e068802 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 5de74ff..ec601e2 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 f7c3d7f..92a2c1f 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 6a8725c..cdf0065 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 aac1c07..0894e89 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 cc77c9d..de08c93 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 58a5244..0df968c 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 087d1e6..51bc513 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 b26306f..5ac59e1 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 f6837b9..be246bf 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 065ec01..307d7b9 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 3285006..cae0b70 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 c298f7d..aa74b79 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 2064aef..d633ecf 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 64009a1..fbcfc1b 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 09a7322..4065742 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 569e36d..b11a5a7 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 2a5d434..e760b07 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 461bbf9..b3c0377 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 d176ec8..89c8b47 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 c464682..9252178 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 aef3cf0..12506e7 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 2f2f9c4..0685f34 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 f2e44c7..7a988f1 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 a7815b6..e34f1ff 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 25d382d..521af9b 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 771ea06..71cab56 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 134d9a4..3d35c58 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 dabcf7a..1172b4a 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,
 };