diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-03-10 17:34:08 +0400 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-25 06:55:03 +0400 |
| commit | 92413a9bee1299cedcc0e5cfbfbc6b42496fb817 (patch) | |
| tree | 4a76bb2e56f3ed69fe23a8ec5c2ad83cfb0a9b36 /drivers | |
| parent | 8bb9660418e05bb1845ac1a2428444d78e322cc7 (diff) | |
| download | linux-92413a9bee1299cedcc0e5cfbfbc6b42496fb817.tar.xz | |
pm2301_charger: Remove __dev* annotations
The removal of __devinit and friends seems to have overlapped with the
addition of the pm2301_charger driver. Currently the driver fails to build
with the following errors:
drivers/power/pm2301_charger.c:843:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_probe'
drivers/power/pm2301_charger.c:1013:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_remove'
drivers/power/pm2301_charger.c:1049:11: error: 'pm2xxx_wall_charger_probe' undeclared here (not in a function)
drivers/power/pm2301_charger.c:1050:2: error: implicit declaration of function '__devexit_p'
drivers/power/pm2301_charger.c:1050:24: error: 'pm2xxx_wall_charger_remove' undeclared here (not in a function)
This patch removes the __dev* annotations, which fixes the build errors.
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/pm2301_charger.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index ed48d75bb786..ca424b844b21 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -851,7 +851,7 @@ static int pm2xxx_wall_charger_suspend(struct i2c_client *i2c_client, return 0; } -static int __devinit pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, +static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, const struct i2c_device_id *id) { struct pm2xxx_platform_data *pl_data = i2c_client->dev.platform_data; @@ -1021,7 +1021,7 @@ free_device_info: return ret; } -static int __devexit pm2xxx_wall_charger_remove(struct i2c_client *i2c_client) +static int pm2xxx_wall_charger_remove(struct i2c_client *i2c_client) { struct pm2xxx_charger *pm2 = i2c_get_clientdata(i2c_client); @@ -1058,7 +1058,7 @@ MODULE_DEVICE_TABLE(i2c, pm2xxx_id); static struct i2c_driver pm2xxx_charger_driver = { .probe = pm2xxx_wall_charger_probe, - .remove = __devexit_p(pm2xxx_wall_charger_remove), + .remove = pm2xxx_wall_charger_remove, .suspend = pm2xxx_wall_charger_suspend, .resume = pm2xxx_wall_charger_resume, .driver = { |