Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / leds / leds-lm355x.c

diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c
index 6bc029255e5b169c9e8dc56fadef99c73127d35f..65d79284c48851fb6bebbbb437bb87899b9c583f 100644 (file)
--- a/drivers/leds/leds-lm355x.c
+++ b/drivers/leds/leds-lm355x.c
@@ -168,7 +168,7 @@ static char lm355x_name[][I2C_NAME_SIZE] = {
 };
 
 /* chip initialize */
-static int __devinit lm355x_chip_init(struct lm355x_chip_data *chip)
+static int lm355x_chip_init(struct lm355x_chip_data *chip)
 {
        int ret;
        unsigned int reg_val;
@@ -420,7 +420,7 @@ static const struct regmap_config lm355x_regmap = {
 };
 
 /* module initialize */
-static int __devinit lm355x_probe(struct i2c_client *client,
+static int lm355x_probe(struct i2c_client *client,
                                  const struct i2c_device_id *id)
 {
        struct lm355x_platform_data *pdata = client->dev.platform_data;
@@ -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;
@@ -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,
 };