From 5f7e22283cec597e532b75d5a455ce6ed75de362 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:20:06 -0500 Subject: [PATCH] extcon: 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 Cc: MyungJoo Ham Cc: Chanwoo Choi Signed-off-by: Greg Kroah-Hartman --- drivers/extcon/extcon-adc-jack.c | 2 +- drivers/extcon/extcon-arizona.c | 2 +- drivers/extcon/extcon-gpio.c | 2 +- drivers/extcon/extcon-max77693.c | 2 +- drivers/extcon/extcon-max8997.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c index 84144e6708c7..eda2a1aa4adb 100644 --- a/drivers/extcon/extcon-adc-jack.c +++ b/drivers/extcon/extcon-adc-jack.c @@ -188,7 +188,7 @@ static int adc_jack_remove(struct platform_device *pdev) static struct platform_driver adc_jack_driver = { .probe = adc_jack_probe, - .remove = __devexit_p(adc_jack_remove), + .remove = adc_jack_remove, .driver = { .name = "adc-jack", .owner = THIS_MODULE, diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 2473be9ac5de..f10f05d4ee9c 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c @@ -544,7 +544,7 @@ static struct platform_driver arizona_extcon_driver = { .owner = THIS_MODULE, }, .probe = arizona_extcon_probe, - .remove = __devexit_p(arizona_extcon_remove), + .remove = arizona_extcon_remove, }; module_platform_driver(arizona_extcon_driver); diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c index e02219e5a3d8..1b14bfcdc176 100644 --- a/drivers/extcon/extcon-gpio.c +++ b/drivers/extcon/extcon-gpio.c @@ -150,7 +150,7 @@ static int gpio_extcon_remove(struct platform_device *pdev) static struct platform_driver gpio_extcon_driver = { .probe = gpio_extcon_probe, - .remove = __devexit_p(gpio_extcon_remove), + .remove = gpio_extcon_remove, .driver = { .name = "extcon-gpio", .owner = THIS_MODULE, diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index 437f573dc582..b656dfa401a6 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c @@ -795,7 +795,7 @@ static struct platform_driver max77693_muic_driver = { .owner = THIS_MODULE, }, .probe = max77693_muic_probe, - .remove = __devexit_p(max77693_muic_remove), + .remove = max77693_muic_remove, }; module_platform_driver(max77693_muic_driver); diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c index 49812991c5e6..bad76f51161b 100644 --- a/drivers/extcon/extcon-max8997.c +++ b/drivers/extcon/extcon-max8997.c @@ -531,7 +531,7 @@ static struct platform_driver max8997_muic_driver = { .owner = THIS_MODULE, }, .probe = max8997_muic_probe, - .remove = __devexit_p(max8997_muic_remove), + .remove = max8997_muic_remove, }; module_platform_driver(max8997_muic_driver);