From 678e8a6be911dd8684b894687ae88ff3b0ae4659 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:26:00 -0500 Subject: [PATCH] leds: remove use of __devexit CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton Cc: Richard Purdie Cc: Jan-Simon Moeller Acked-by: Bryan Wu Signed-off-by: Greg Kroah-Hartman --- drivers/leds/leds-adp5520.c | 2 +- drivers/leds/leds-asic3.c | 2 +- drivers/leds/leds-blinkm.c | 2 +- drivers/leds/leds-cobalt-qube.c | 2 +- drivers/leds/leds-cobalt-raq.c | 2 +- drivers/leds/leds-da903x.c | 2 +- drivers/leds/leds-da9052.c | 2 +- drivers/leds/leds-gpio.c | 2 +- drivers/leds/leds-lm3530.c | 2 +- drivers/leds/leds-lm3533.c | 2 +- drivers/leds/leds-lm355x.c | 2 +- drivers/leds/leds-lm3642.c | 2 +- drivers/leds/leds-lp3944.c | 2 +- drivers/leds/leds-lp5521.c | 2 +- drivers/leds/leds-lp8788.c | 2 +- drivers/leds/leds-lt3593.c | 2 +- drivers/leds/leds-max8997.c | 2 +- drivers/leds/leds-mc13783.c | 2 +- drivers/leds/leds-netxbig.c | 2 +- drivers/leds/leds-ns2.c | 2 +- drivers/leds/leds-ot200.c | 2 +- drivers/leds/leds-pca955x.c | 2 +- drivers/leds/leds-pca9633.c | 2 +- drivers/leds/leds-pwm.c | 2 +- drivers/leds/leds-rb532.c | 2 +- drivers/leds/leds-regulator.c | 2 +- drivers/leds/leds-renesas-tpu.c | 2 +- drivers/leds/leds-sunfire.c | 2 +- drivers/leds/leds-tca6507.c | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c index 28c97667c079..dcd9128a51a9 100644 --- a/drivers/leds/leds-adp5520.c +++ b/drivers/leds/leds-adp5520.c @@ -183,7 +183,7 @@ err: return ret; } -static int __devexit adp5520_led_remove(struct platform_device *pdev) +static int adp5520_led_remove(struct platform_device *pdev) { struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data; struct adp5520_led *led; diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c index c700ad9053f5..b474745e001b 100644 --- a/drivers/leds/leds-asic3.c +++ b/drivers/leds/leds-asic3.c @@ -125,7 +125,7 @@ out: return ret; } -static int __devexit asic3_led_remove(struct platform_device *pdev) +static int asic3_led_remove(struct platform_device *pdev) { struct asic3_led *led = pdev->dev.platform_data; diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c index 5ed27d318074..a502678cc7f5 100644 --- a/drivers/leds/leds-blinkm.c +++ b/drivers/leds/leds-blinkm.c @@ -743,7 +743,7 @@ exit: return err; } -static int __devexit blinkm_remove(struct i2c_client *client) +static int blinkm_remove(struct i2c_client *client) { struct blinkm_data *data = i2c_get_clientdata(client); int ret = 0; diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c index f663979db63d..ffa99303b629 100644 --- a/drivers/leds/leds-cobalt-qube.c +++ b/drivers/leds/leds-cobalt-qube.c @@ -63,7 +63,7 @@ err_iounmap: return retval; } -static int __devexit cobalt_qube_led_remove(struct platform_device *pdev) +static int cobalt_qube_led_remove(struct platform_device *pdev) { led_classdev_unregister(&qube_front_led); diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c index 9d88dc2f81a5..d52e47de396f 100644 --- a/drivers/leds/leds-cobalt-raq.c +++ b/drivers/leds/leds-cobalt-raq.c @@ -109,7 +109,7 @@ err_iounmap: return retval; } -static int __devexit cobalt_raq_led_remove(struct platform_device *pdev) +static int cobalt_raq_led_remove(struct platform_device *pdev) { led_classdev_unregister(&raq_power_off_led); led_classdev_unregister(&raq_web_led); diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c index bb174905b0fe..6f31b776765b 100644 --- a/drivers/leds/leds-da903x.c +++ b/drivers/leds/leds-da903x.c @@ -136,7 +136,7 @@ static int da903x_led_probe(struct platform_device *pdev) return 0; } -static int __devexit da903x_led_remove(struct platform_device *pdev) +static int da903x_led_remove(struct platform_device *pdev) { struct da903x_led *led = platform_get_drvdata(pdev); diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c index ded9931010a8..efec43344e9f 100644 --- a/drivers/leds/leds-da9052.c +++ b/drivers/leds/leds-da9052.c @@ -176,7 +176,7 @@ err: return error; } -static int __devexit da9052_led_remove(struct platform_device *pdev) +static int da9052_led_remove(struct platform_device *pdev) { struct da9052_led *led = platform_get_drvdata(pdev); struct da9052_pdata *pdata; diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 5c9efc73f06a..291c20797ca0 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -273,7 +273,7 @@ static int gpio_led_probe(struct platform_device *pdev) return 0; } -static int __devexit gpio_led_remove(struct platform_device *pdev) +static int gpio_led_remove(struct platform_device *pdev) { struct gpio_leds_priv *priv = platform_get_drvdata(pdev); int i; diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c index 1aaaaa230c99..214145483836 100644 --- a/drivers/leds/leds-lm3530.c +++ b/drivers/leds/leds-lm3530.c @@ -452,7 +452,7 @@ err_create_file: return err; } -static int __devexit lm3530_remove(struct i2c_client *client) +static int lm3530_remove(struct i2c_client *client) { struct lm3530_data *drvdata = i2c_get_clientdata(client); diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c index 7a60440c5806..bbf24d038a7f 100644 --- a/drivers/leds/leds-lm3533.c +++ b/drivers/leds/leds-lm3533.c @@ -742,7 +742,7 @@ err_unregister: return ret; } -static int __devexit lm3533_led_remove(struct platform_device *pdev) +static int lm3533_led_remove(struct platform_device *pdev) { struct lm3533_led *led = platform_get_drvdata(pdev); diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c index 0c9d3a083ac2..b13ce0371918 100644 --- a/drivers/leds/leds-lm355x.c +++ b/drivers/leds/leds-lm355x.c @@ -526,7 +526,7 @@ err_out: return err; } -static int __devexit lm355x_remove(struct i2c_client *client) +static int lm355x_remove(struct i2c_client *client) { struct lm355x_chip_data *chip = i2c_get_clientdata(client); struct lm355x_reg_data *preg = chip->regs; diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c index 20a45812219b..215a7c1e56cc 100644 --- a/drivers/leds/leds-lm3642.c +++ b/drivers/leds/leds-lm3642.c @@ -420,7 +420,7 @@ err_out: return err; } -static int __devexit lm3642_remove(struct i2c_client *client) +static int lm3642_remove(struct i2c_client *client) { struct lm3642_chip_data *chip = i2c_get_clientdata(client); diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c index 1544124bfcc5..b081f67e1dea 100644 --- a/drivers/leds/leds-lp3944.c +++ b/drivers/leds/leds-lp3944.c @@ -411,7 +411,7 @@ static int lp3944_probe(struct i2c_client *client, return 0; } -static int __devexit lp3944_remove(struct i2c_client *client) +static int lp3944_remove(struct i2c_client *client) { struct lp3944_platform_data *pdata = client->dev.platform_data; struct lp3944_data *data = i2c_get_clientdata(client); diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c index 847434c21f28..966f158a07db 100644 --- a/drivers/leds/leds-lp5521.c +++ b/drivers/leds/leds-lp5521.c @@ -855,7 +855,7 @@ fail1: return ret; } -static int __devexit lp5521_remove(struct i2c_client *client) +static int lp5521_remove(struct i2c_client *client) { struct lp5521_chip *chip = i2c_get_clientdata(client); int i; diff --git a/drivers/leds/leds-lp8788.c b/drivers/leds/leds-lp8788.c index 27831ffe3953..4353942c5fd1 100644 --- a/drivers/leds/leds-lp8788.c +++ b/drivers/leds/leds-lp8788.c @@ -167,7 +167,7 @@ static int lp8788_led_probe(struct platform_device *pdev) return 0; } -static int __devexit lp8788_led_remove(struct platform_device *pdev) +static int lp8788_led_remove(struct platform_device *pdev) { struct lp8788_led *led = platform_get_drvdata(pdev); diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c index 6487293a5e6d..34b3ba4376fc 100644 --- a/drivers/leds/leds-lt3593.c +++ b/drivers/leds/leds-lt3593.c @@ -173,7 +173,7 @@ err: return ret; } -static int __devexit lt3593_led_remove(struct platform_device *pdev) +static int lt3593_led_remove(struct platform_device *pdev) { int i; struct gpio_led_platform_data *pdata = pdev->dev.platform_data; diff --git a/drivers/leds/leds-max8997.c b/drivers/leds/leds-max8997.c index f8db895acaf5..f449a8bdddc7 100644 --- a/drivers/leds/leds-max8997.c +++ b/drivers/leds/leds-max8997.c @@ -292,7 +292,7 @@ static int max8997_led_probe(struct platform_device *pdev) return 0; } -static int __devexit max8997_led_remove(struct platform_device *pdev) +static int max8997_led_remove(struct platform_device *pdev) { struct max8997_led *led = platform_get_drvdata(pdev); diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c index 39f72a7a1794..e942adaa7504 100644 --- a/drivers/leds/leds-mc13783.c +++ b/drivers/leds/leds-mc13783.c @@ -348,7 +348,7 @@ err_register: return ret; } -static int __devexit mc13783_led_remove(struct platform_device *pdev) +static int mc13783_led_remove(struct platform_device *pdev) { struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev); struct mc13783_led *led = platform_get_drvdata(pdev); diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c index 5f2421804a0d..58a800b17dc7 100644 --- a/drivers/leds/leds-netxbig.c +++ b/drivers/leds/leds-netxbig.c @@ -389,7 +389,7 @@ err_free_leds: return ret; } -static int __devexit netxbig_led_remove(struct platform_device *pdev) +static int netxbig_led_remove(struct platform_device *pdev) { struct netxbig_led_platform_data *pdata = pdev->dev.platform_data; struct netxbig_led_data *leds_data; diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c index f5d0df32ab83..6315e88d04fd 100644 --- a/drivers/leds/leds-ns2.c +++ b/drivers/leds/leds-ns2.c @@ -292,7 +292,7 @@ static int ns2_led_probe(struct platform_device *pdev) return 0; } -static int __devexit ns2_led_remove(struct platform_device *pdev) +static int ns2_led_remove(struct platform_device *pdev) { int i; struct ns2_led_platform_data *pdata = pdev->dev.platform_data; diff --git a/drivers/leds/leds-ot200.c b/drivers/leds/leds-ot200.c index 4c26aa2d7af6..ee14662ed5ce 100644 --- a/drivers/leds/leds-ot200.c +++ b/drivers/leds/leds-ot200.c @@ -144,7 +144,7 @@ err: return ret; } -static int __devexit ot200_led_remove(struct platform_device *pdev) +static int ot200_led_remove(struct platform_device *pdev) { int i; diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c index f07c5203fbd5..706791af8fc8 100644 --- a/drivers/leds/leds-pca955x.c +++ b/drivers/leds/leds-pca955x.c @@ -363,7 +363,7 @@ exit: return err; } -static int __devexit pca955x_remove(struct i2c_client *client) +static int pca955x_remove(struct i2c_client *client) { struct pca955x *pca955x = i2c_get_clientdata(client); int i; diff --git a/drivers/leds/leds-pca9633.c b/drivers/leds/leds-pca9633.c index d55bd8dc4813..9aae5679ffb2 100644 --- a/drivers/leds/leds-pca9633.c +++ b/drivers/leds/leds-pca9633.c @@ -164,7 +164,7 @@ exit: return err; } -static int __devexit pca9633_remove(struct i2c_client *client) +static int pca9633_remove(struct i2c_client *client) { struct pca9633_led *pca9633 = i2c_get_clientdata(client); int i; diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c index 7a988f18522a..e51ff7a3cd88 100644 --- a/drivers/leds/leds-pwm.c +++ b/drivers/leds/leds-pwm.c @@ -107,7 +107,7 @@ err: return ret; } -static int __devexit led_pwm_remove(struct platform_device *pdev) +static int led_pwm_remove(struct platform_device *pdev) { int i; struct led_pwm_platform_data *pdata = pdev->dev.platform_data; diff --git a/drivers/leds/leds-rb532.c b/drivers/leds/leds-rb532.c index 43f02f4a1953..9ebdd5011a7c 100644 --- a/drivers/leds/leds-rb532.c +++ b/drivers/leds/leds-rb532.c @@ -42,7 +42,7 @@ static int rb532_led_probe(struct platform_device *pdev) return led_classdev_register(&pdev->dev, &rb532_uled); } -static int __devexit rb532_led_remove(struct platform_device *pdev) +static int rb532_led_remove(struct platform_device *pdev) { led_classdev_unregister(&rb532_uled); return 0; diff --git a/drivers/leds/leds-regulator.c b/drivers/leds/leds-regulator.c index adb33f7c73ad..4253a9b03dbf 100644 --- a/drivers/leds/leds-regulator.c +++ b/drivers/leds/leds-regulator.c @@ -206,7 +206,7 @@ err_vcc: return ret; } -static int __devexit regulator_led_remove(struct platform_device *pdev) +static int regulator_led_remove(struct platform_device *pdev) { struct regulator_led *led = platform_get_drvdata(pdev); diff --git a/drivers/leds/leds-renesas-tpu.c b/drivers/leds/leds-renesas-tpu.c index 053e45763f3c..bc8984795a3e 100644 --- a/drivers/leds/leds-renesas-tpu.c +++ b/drivers/leds/leds-renesas-tpu.c @@ -309,7 +309,7 @@ static int r_tpu_probe(struct platform_device *pdev) return ret; } -static int __devexit r_tpu_remove(struct platform_device *pdev) +static int r_tpu_remove(struct platform_device *pdev) { struct r_tpu_priv *p = platform_get_drvdata(pdev); diff --git a/drivers/leds/leds-sunfire.c b/drivers/leds/leds-sunfire.c index f72886e08c22..07ff5a3a6cee 100644 --- a/drivers/leds/leds-sunfire.c +++ b/drivers/leds/leds-sunfire.c @@ -165,7 +165,7 @@ static int sunfire_led_generic_probe(struct platform_device *pdev, return 0; } -static int __devexit sunfire_led_generic_remove(struct platform_device *pdev) +static int sunfire_led_generic_remove(struct platform_device *pdev) { struct sunfire_drvdata *p = dev_get_drvdata(&pdev->dev); int i; diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c index 9acec6130494..b26a63bae16b 100644 --- a/drivers/leds/leds-tca6507.c +++ b/drivers/leds/leds-tca6507.c @@ -730,7 +730,7 @@ exit: return err; } -static int __devexit tca6507_remove(struct i2c_client *client) +static int tca6507_remove(struct i2c_client *client) { int i; struct tca6507_chip *tca = i2c_get_clientdata(client); -- 2.20.1