diff options
| -rw-r--r-- | drivers/misc/akm8975.c | 2 | ||||
| -rw-r--r-- | drivers/power/android_battery.c | 6 | ||||
| -rw-r--r-- | drivers/switch/switch_gpio.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/misc/akm8975.c b/drivers/misc/akm8975.c index 830d2897afd..31eadf8fcf4 100644 --- a/drivers/misc/akm8975.c +++ b/drivers/misc/akm8975.c @@ -678,7 +678,7 @@ exit_platform_data_null: return err; } -static int __devexit akm8975_remove(struct i2c_client *client) +static int akm8975_remove(struct i2c_client *client) { struct akm8975_data *akm = i2c_get_clientdata(client); FUNCDBG("called"); diff --git a/drivers/power/android_battery.c b/drivers/power/android_battery.c index e0cefafbfb9..dbba090a51e 100644 --- a/drivers/power/android_battery.c +++ b/drivers/power/android_battery.c @@ -573,7 +573,7 @@ static const struct file_operations android_power_debug_fops = { .release = single_release, }; -static __devinit int android_bat_probe(struct platform_device *pdev) +static int android_bat_probe(struct platform_device *pdev) { struct android_bat_platform_data *pdata = dev_get_platdata(&pdev->dev); struct android_bat_data *battery; @@ -700,7 +700,7 @@ err_pdata: return ret; } -static int __devexit android_bat_remove(struct platform_device *pdev) +static int android_bat_remove(struct platform_device *pdev) { struct android_bat_data *battery = platform_get_drvdata(pdev); @@ -747,7 +747,7 @@ static struct platform_driver android_bat_driver = { .pm = &android_bat_pm_ops, }, .probe = android_bat_probe, - .remove = __devexit_p(android_bat_remove), + .remove = android_bat_remove, }; static int __init android_bat_init(void) diff --git a/drivers/switch/switch_gpio.c b/drivers/switch/switch_gpio.c index 7e9faa211e4..15d5f04b3df 100644 --- a/drivers/switch/switch_gpio.c +++ b/drivers/switch/switch_gpio.c @@ -133,7 +133,7 @@ err_switch_dev_register: return ret; } -static int __devexit gpio_switch_remove(struct platform_device *pdev) +static int gpio_switch_remove(struct platform_device *pdev) { struct gpio_switch_data *switch_data = platform_get_drvdata(pdev); @@ -147,7 +147,7 @@ static int __devexit gpio_switch_remove(struct platform_device *pdev) static struct platform_driver gpio_switch_driver = { .probe = gpio_switch_probe, - .remove = __devexit_p(gpio_switch_remove), + .remove = gpio_switch_remove, .driver = { .name = "switch-gpio", .owner = THIS_MODULE, |