fixup: remove __dev*

39 files changed, 98 insertions, 98 deletions

diff --git a/arch/arm/mach-tegra/pinmux-t11-tables.c b/arch/arm/mach-tegra/pinmux-t11-tables.c
index 1acf054e6e8a..b0b41185bbaf 100644
--- a/arch/arm/mach-tegra/pinmux-t11-tables.c
+++ b/arch/arm/mach-tegra/pinmux-t11-tables.c
@@ -451,7 +451,7 @@ static struct syscore_ops tegra_pinmux_syscore_ops = {
 };
 #endif
 
-void __devinit tegra11x_pinmux_init(const struct tegra_pingroup_desc **pg,
+void tegra11x_pinmux_init(const struct tegra_pingroup_desc **pg,
 		int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,
 		int *pgdrive_max, const int **gpiomap, int *gpiomap_max)
 {
diff --git a/arch/arm/mach-tegra/pinmux-t14-tables.c b/arch/arm/mach-tegra/pinmux-t14-tables.c
index e9e7bea80860..5d170c5ec16b 100644
--- a/arch/arm/mach-tegra/pinmux-t14-tables.c
+++ b/arch/arm/mach-tegra/pinmux-t14-tables.c
@@ -355,7 +355,7 @@ static struct syscore_ops tegra14x_pinmux_syscore_ops = {
 };
 #endif
 
-void __devinit tegra14x_pinmux_init(const struct tegra_pingroup_desc **pg,
+void tegra14x_pinmux_init(const struct tegra_pingroup_desc **pg,
 		int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,
 		int *pgdrive_max, const int **gpiomap, int *gpiomap_max)
 {
diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
index d79a10e00125..5fc148ff6381 100644
--- a/arch/arm/mach-tegra/pinmux.c
+++ b/arch/arm/mach-tegra/pinmux.c
@@ -1081,7 +1081,7 @@ static int tegra_pinmux_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static struct platform_device_id __devinitdata tegra_pinmux_id[] = {
+static struct platform_device_id tegra_pinmux_id[] = {
 #ifdef CONFIG_ARCH_TEGRA_2x_SOC
 	{ .name = "tegra20-pinmux-ctl",
 	  .driver_data = (kernel_ulong_t)tegra20_pinmux_init, },
diff --git a/arch/arm/mach-tegra/tegra11_emc.c b/arch/arm/mach-tegra/tegra11_emc.c
index 12c739dbb765..b8b68a3b972b 100644
--- a/arch/arm/mach-tegra/tegra11_emc.c
+++ b/arch/arm/mach-tegra/tegra11_emc.c
@@ -1524,7 +1524,7 @@ static struct kernel_param_ops tegra11_pasr_enable_ops = {
 module_param_cb(pasr_enable, &tegra11_pasr_enable_ops, &pasr_enable, 0644);
 #endif
 
-static int __devinit tegra11_emc_probe(struct platform_device *pdev)
+static int tegra11_emc_probe(struct platform_device *pdev)
 {
 	struct tegra11_emc_pdata *pdata;
 	struct resource *res;
@@ -1553,7 +1553,7 @@ static int __devinit tegra11_emc_probe(struct platform_device *pdev)
 	return init_emc_table(pdata->tables, pdata->num_tables);
 }
 
-static struct of_device_id tegra11_emc_of_match[] __devinitdata = {
+static struct of_device_id tegra11_emc_of_match[] = {
 	{ .compatible = "nvidia,tegra11-emc", },
 	{ },
 };
diff --git a/arch/arm/mach-tegra/tegra14_emc.c b/arch/arm/mach-tegra/tegra14_emc.c
index 997f3a4417db..9b3dec089c9e 100644
--- a/arch/arm/mach-tegra/tegra14_emc.c
+++ b/arch/arm/mach-tegra/tegra14_emc.c
@@ -1376,7 +1376,7 @@ static struct kernel_param_ops tegra14_pasr_enable_ops = {
 module_param_cb(pasr_enable, &tegra14_pasr_enable_ops, &pasr_enable, 0644);
 #endif
 
-static int __devinit tegra14_emc_probe(struct platform_device *pdev)
+static int tegra14_emc_probe(struct platform_device *pdev)
 {
 	struct tegra14_emc_pdata *pdata;
 	struct resource *res;
diff --git a/drivers/edp/psy_depletion.c b/drivers/edp/psy_depletion.c
index 30327f6b6715..2f3755b8d957 100644
--- a/drivers/edp/psy_depletion.c
+++ b/drivers/edp/psy_depletion.c
@@ -248,7 +248,7 @@ static int depl_resume(struct platform_device *pdev)
 	return 0;
 }
 
-static __devinit int depl_init_ocv_reader(struct depl_driver *drv)
+static int depl_init_ocv_reader(struct depl_driver *drv)
 {
 	if (drv->pdata->ocv_lut)
 		drv->get_ocv = depl_psy_ocv_from_lut;
@@ -261,7 +261,7 @@ static __devinit int depl_init_ocv_reader(struct depl_driver *drv)
 	return 0;
 }
 
-static __devinit int depl_probe(struct platform_device *pdev)
+static int depl_probe(struct platform_device *pdev)
 {
 	struct depl_driver *drv;
 	struct edp_manager *m;
diff --git a/drivers/edp/tegra_core.c b/drivers/edp/tegra_core.c
index 3dbde7f29914..bb170265bd62 100644
--- a/drivers/edp/tegra_core.c
+++ b/drivers/edp/tegra_core.c
@@ -341,7 +341,7 @@ static void create_attr(const char *name, struct dentry *parent,
 	WARN_ON(IS_ERR_OR_NULL(d));
 }
 
-static __devinit void init_debug(void)
+static void init_debug(void)
 {
 	if (!core_client.dentry) {
 		WARN_ON(1);
@@ -362,7 +362,7 @@ static inline void init_debug(void) {}
 #endif
 
 /* Ignore missing modem */
-static __devinit void register_loan(void)
+static void register_loan(void)
 {
 	struct edp_client *c;
 	int r;
@@ -377,7 +377,7 @@ static __devinit void register_loan(void)
 	WARN_ON(r);
 }
 
-static __devinit unsigned int get_num_states(
+static unsigned int get_num_states(
 		struct tegra_sysedp_platform_data *pdata)
 {
 	unsigned int power = 0;
@@ -394,7 +394,7 @@ static __devinit unsigned int get_num_states(
 	return num;
 }
 
-static __devinit void get_states(struct tegra_sysedp_platform_data *pdata,
+static void get_states(struct tegra_sysedp_platform_data *pdata,
 		unsigned int num, unsigned int *states)
 {
 	unsigned int power = 0;
@@ -411,7 +411,7 @@ static __devinit void get_states(struct tegra_sysedp_platform_data *pdata,
 	}
 }
 
-static __devinit unsigned int initial_req(struct edp_client *client,
+static unsigned int initial_req(struct edp_client *client,
 		unsigned int watts)
 {
 	int i;
@@ -425,7 +425,7 @@ static __devinit unsigned int initial_req(struct edp_client *client,
 	return 0;
 }
 
-static __devinit int init_client(struct tegra_sysedp_platform_data *pdata)
+static int init_client(struct tegra_sysedp_platform_data *pdata)
 {
 	struct edp_manager *m;
 	unsigned int cnt;
@@ -469,7 +469,7 @@ fail:
 	return r;
 }
 
-static __devinit int init_clks(void)
+static int init_clks(void)
 {
 	emc_cap_clk = clk_get_sys("battery_edp", "emc");
 	if (IS_ERR(emc_cap_clk))
@@ -484,7 +484,7 @@ static __devinit int init_clks(void)
 	return 0;
 }
 
-static __devinit int tegra_sysedp_probe(struct platform_device *pdev)
+static int tegra_sysedp_probe(struct platform_device *pdev)
 {
 	int r;
 
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
index 901d4026f2be..089f064eadd1 100644
--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -127,7 +127,7 @@ static irqreturn_t palmas_extcon_irq(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static int __devinit palmas_extcon_probe(struct platform_device *pdev)
+static int palmas_extcon_probe(struct platform_device *pdev)
 {
 	struct palmas_platform_data *pdata;
 	struct palmas_extcon_platform_data *epdata = NULL;
@@ -233,7 +233,7 @@ out:
 	return ret;
 }
 
-static int __devexit palmas_extcon_remove(struct platform_device *pdev)
+static int palmas_extcon_remove(struct platform_device *pdev)
 {
 	struct palmas_extcon *palma_econ = dev_get_drvdata(&pdev->dev);
 
@@ -280,7 +280,7 @@ static const struct dev_pm_ops palmas_pm_ops = {
 
 static struct platform_driver palmas_extcon_driver = {
 	.probe = palmas_extcon_probe,
-	.remove = __devexit_p(palmas_extcon_remove),
+	.remove = palmas_extcon_remove,
 	.driver = {
 		.name = "palmas-extcon",
 		.owner = THIS_MODULE,
diff --git a/drivers/gpio/gpio-max77660.c b/drivers/gpio/gpio-max77660.c
index 091c805a4020..f6d18b92bf56 100644
--- a/drivers/gpio/gpio-max77660.c
+++ b/drivers/gpio/gpio-max77660.c
@@ -287,7 +287,7 @@ static void max77660_gpio_irq_remove(struct max77660_gpio *max77660_gpio)
 	chip->gpio_irq_data = NULL;
 }
 
-static int __devinit max77660_gpio_probe(struct platform_device *pdev)
+static int max77660_gpio_probe(struct platform_device *pdev)
 {
 	struct max77660_platform_data *pdata;
 	struct max77660_gpio *max77660_gpio;
@@ -355,7 +355,7 @@ fail:
 	return ret;
 }
 
-static int __devexit max77660_gpio_remove(struct platform_device *pdev)
+static int max77660_gpio_remove(struct platform_device *pdev)
 {
 	struct max77660_gpio *max77660_gpio = platform_get_drvdata(pdev);
 	int ret;
@@ -373,7 +373,7 @@ static struct platform_driver max77660_gpio_driver = {
 	.driver.name	= "max77660-gpio",
 	.driver.owner	= THIS_MODULE,
 	.probe		= max77660_gpio_probe,
-	.remove		= __devexit_p(max77660_gpio_remove),
+	.remove		= max77660_gpio_remove,
 };
 
 static int __init max77660_gpio_init(void)
diff --git a/drivers/gpio/gpio-max77663.c b/drivers/gpio/gpio-max77663.c
index feba7fe5a73d..898288752bc4 100644
--- a/drivers/gpio/gpio-max77663.c
+++ b/drivers/gpio/gpio-max77663.c
@@ -562,7 +562,7 @@ static int max77663_gpio_init_regs(struct max77663_gpio *max77663_gpio,
 	return 0;
 }
 
-static int __devinit max77663_gpio_probe(struct platform_device *pdev)
+static int max77663_gpio_probe(struct platform_device *pdev)
 {
 	struct max77663_platform_data *pdata;
 	struct max77663_gpio *max77663_gpio;
@@ -639,7 +639,7 @@ fail:
 	return ret;
 }
 
-static int __devexit max77663_gpio_remove(struct platform_device *pdev)
+static int max77663_gpio_remove(struct platform_device *pdev)
 {
 	struct max77663_gpio *max77663_gpio = platform_get_drvdata(pdev);
 
@@ -653,7 +653,7 @@ static struct platform_driver max77663_gpio_driver = {
 	.driver.name	= "max77663-gpio",
 	.driver.owner	= THIS_MODULE,
 	.probe		= max77663_gpio_probe,
-	.remove		= __devexit_p(max77663_gpio_remove),
+	.remove		= max77663_gpio_remove,
 };
 
 static int __init max77663_gpio_init(void)
diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c
index e54e3f522086..0ad65a978199 100644
--- a/drivers/gpio/gpio-palmas.c
+++ b/drivers/gpio/gpio-palmas.c
@@ -214,7 +214,7 @@ static struct gpio_chip palmas_gpio_chip = {
 	.ngpio			= 8,
 };
 
-static int __devinit palmas_gpio_probe(struct platform_device *pdev)
+static int palmas_gpio_probe(struct platform_device *pdev)
 {
 	struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
 	struct palmas_platform_data *pdata = palmas->dev->platform_data;
@@ -252,7 +252,7 @@ err:
 	return ret;
 }
 
-static int __devexit palmas_gpio_remove(struct platform_device *pdev)
+static int palmas_gpio_remove(struct platform_device *pdev)
 {
 	struct palmas_gpio *gpio = platform_get_drvdata(pdev);
 	int ret;
@@ -268,7 +268,7 @@ static struct platform_driver palmas_gpio_driver = {
 	.driver.name	= "palmas-gpio",
 	.driver.owner	= THIS_MODULE,
 	.probe		= palmas_gpio_probe,
-	.remove		= __devexit_p(palmas_gpio_remove),
+	.remove		= palmas_gpio_remove,
 };
 
 static int __init palmas_gpio_init(void)
diff --git a/drivers/input/misc/drv2603-vibrator.c b/drivers/input/misc/drv2603-vibrator.c
index 852e9c62bab9..d7dfd0cdf901 100644
--- a/drivers/input/misc/drv2603-vibrator.c
+++ b/drivers/input/misc/drv2603-vibrator.c
@@ -214,7 +214,7 @@ static const struct attribute_group drv2603_vibrator_attr_group = {
 	.attrs = drv2603_vibrator_attr,
 };
 
-static int __devinit drv2603_probe(struct platform_device *pdev)
+static int drv2603_probe(struct platform_device *pdev)
 {
 	int ret;
 
@@ -364,7 +364,7 @@ err_regulator:
 	return ret;
 }
 
-static int __devexit drv2603_remove(struct platform_device *pdev)
+static int drv2603_remove(struct platform_device *pdev)
 {
 	struct drv2603_chip *chip = dev_get_drvdata(&pdev->dev);
 
@@ -402,7 +402,7 @@ static SIMPLE_DEV_PM_OPS(drv2603_pm_ops, drv2603_suspend, drv2603_resume);
 
 static struct platform_driver drv2603_driver = {
 	.probe = drv2603_probe,
-	.remove = __devexit_p(drv2603_remove),
+	.remove = drv2603_remove,
 	.driver = {
 		.name = "drv2603-vibrator",
 		.owner = THIS_MODULE,
diff --git a/drivers/input/misc/max77660_haptic.c b/drivers/input/misc/max77660_haptic.c
index 1eecb3fef77d..131e438db9cb 100644
--- a/drivers/input/misc/max77660_haptic.c
+++ b/drivers/input/misc/max77660_haptic.c
@@ -373,7 +373,7 @@ static const struct attribute_group max77660_haptics_attr_group = {
 	.attrs = max77660_haptics_attr,
 };
 
-static int __devinit max77660_haptic_probe(struct platform_device *pdev)
+static int max77660_haptic_probe(struct platform_device *pdev)
 {
 	/* we register the parent platform data */
 	struct max77660_platform_data *parent_pdata;
@@ -538,7 +538,7 @@ err_input_alloc:
 	return ret;
 }
 
-static int __devexit max77660_haptic_remove(struct platform_device *pdev)
+static int max77660_haptic_remove(struct platform_device *pdev)
 {
 	struct max77660_haptic *chip = platform_get_drvdata(pdev);
 
@@ -588,7 +588,7 @@ static struct platform_driver max77660_haptic_driver = {
 		.pm	= &max77660_haptic_pm_ops,
 	},
 	.probe		= max77660_haptic_probe,
-	.remove		= __devexit_p(max77660_haptic_remove),
+	.remove		= max77660_haptic_remove,
 	.id_table	= max77660_haptic_id,
 };
 
diff --git a/drivers/leds/leds-max8831.c b/drivers/leds/leds-max8831.c
index 0ae7fe7bd2a8..d7727ceb02cf 100644
--- a/drivers/leds/leds-max8831.c
+++ b/drivers/leds/leds-max8831.c
@@ -146,7 +146,7 @@ static int max8831_led_set_blink(struct led_classdev *led_cdev,
 	return 0;
 }
 
-static int __devinit max8831_led_probe(struct platform_device *pdev)
+static int max8831_led_probe(struct platform_device *pdev)
 {
 	struct led_info *pdata = pdev->dev.platform_data;
 	struct max8831_led *led;
@@ -182,7 +182,7 @@ static int __devinit max8831_led_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit max8831_led_remove(struct platform_device *pdev)
+static int max8831_led_remove(struct platform_device *pdev)
 {
 	struct max8831_led *led = platform_get_drvdata(pdev);
 	led_classdev_unregister(&led->cdev);
@@ -196,7 +196,7 @@ static struct platform_driver max8831_led_driver = {
 		.owner	= THIS_MODULE,
 	},
 	.probe	= max8831_led_probe,
-	.remove	= __devexit_p(max8831_led_remove),
+	.remove	= max8831_led_remove,
 };
 module_platform_driver(max8831_led_driver);
 
diff --git a/drivers/mfd/max77660-core.c b/drivers/mfd/max77660-core.c
index 76d7ffbff269..5db410b9537b 100644
--- a/drivers/mfd/max77660-core.c
+++ b/drivers/mfd/max77660-core.c
@@ -613,7 +613,7 @@ fail_client_reg:
 	return ret;
 }
 
-static int __devexit max77660_remove(struct i2c_client *client)
+static int max77660_remove(struct i2c_client *client)
 {
 	struct max77660_chip *chip = i2c_get_clientdata(client);
 	struct max77660_platform_data *pdata = client->dev.platform_data;
@@ -643,7 +643,7 @@ static struct i2c_driver max77660_driver = {
 		.owner = THIS_MODULE,
 	},
 	.probe = max77660_probe,
-	.remove = __devexit_p(max77660_remove),
+	.remove = max77660_remove,
 	.id_table = max77660_id,
 };
 
diff --git a/drivers/mfd/max8831.c b/drivers/mfd/max8831.c
index c90b08736598..18f2042a866e 100644
--- a/drivers/mfd/max8831.c
+++ b/drivers/mfd/max8831.c
@@ -68,7 +68,7 @@ static struct mfd_cell max8831_mfd_cells[] = {
 	},
 };
 
-static int __devinit max8831_probe(struct i2c_client *client,
+static int max8831_probe(struct i2c_client *client,
 	const struct i2c_device_id *id)
 {
 	struct max8831_platform_data *pdata = client->dev.platform_data;
@@ -114,7 +114,7 @@ failed:
 	return ret;
 }
 
-static int __devexit max8831_remove(struct i2c_client *client)
+static int max8831_remove(struct i2c_client *client)
 {
 	struct max8831_chip *chip = i2c_get_clientdata(client);
 	mfd_remove_devices(chip->dev);
@@ -127,7 +127,7 @@ static struct i2c_driver max8831_driver = {
 		.owner	= THIS_MODULE,
 	},
 	.probe	= max8831_probe,
-	.remove	= __devexit_p(max8831_remove),
+	.remove	= max8831_remove,
 	.id_table = max8831_id,
 };
 module_i2c_driver(max8831_driver);
diff --git a/drivers/mfd/ricoh583.c b/drivers/mfd/ricoh583.c
index 1b349b4568c9..56cce66175e7 100644
--- a/drivers/mfd/ricoh583.c
+++ b/drivers/mfd/ricoh583.c
@@ -1088,7 +1088,7 @@ static void __init ricoh583_debuginit(struct ricoh583 *tpsi)
 }
 #endif
 
-static int __devinit ricoh583_i2c_probe(struct i2c_client *i2c,
+static int ricoh583_i2c_probe(struct i2c_client *i2c,
 			      const struct i2c_device_id *id)
 {
 	struct ricoh583 *ricoh583;
diff --git a/drivers/mfd/tlv320aic3xxx-i2c.c b/drivers/mfd/tlv320aic3xxx-i2c.c
index c824975e86d5..3f21e4b6933e 100644
--- a/drivers/mfd/tlv320aic3xxx-i2c.c
+++ b/drivers/mfd/tlv320aic3xxx-i2c.c
@@ -56,7 +56,7 @@ static int aic3xxx_resume(struct device *dev)
 }
 #endif
 
-static __devinit int aic3xxx_i2c_probe(struct i2c_client *i2c,
+static int aic3xxx_i2c_probe(struct i2c_client *i2c,
 					  const struct i2c_device_id *id)
 {
 	struct aic3xxx *aicxxx;
@@ -98,7 +98,7 @@ static __devinit int aic3xxx_i2c_probe(struct i2c_client *i2c,
 	return aic3xxx_device_init(aicxxx, aicxxx->irq);
 }
 
-static int __devexit aic3xxx_i2c_remove(struct i2c_client *i2c)
+static int aic3xxx_i2c_remove(struct i2c_client *i2c)
 {
 	struct aic3xxx *aicxxx = dev_get_drvdata(&i2c->dev);
 	aic3xxx_device_exit(aicxxx);
@@ -130,7 +130,7 @@ static struct i2c_driver aic3xxx_i2c_driver = {
 		.pm	= &aic3xxx_pm_ops,
 	},
 	.probe		= aic3xxx_i2c_probe,
-	.remove		= __devexit_p(aic3xxx_i2c_remove),
+	.remove		= aic3xxx_i2c_remove,
 	.id_table	= aic3xxx_i2c_id,
 	.shutdown	= aic3xxx_i2c_shutdown,
 };
diff --git a/drivers/mfd/tlv320aic3xxx-spi.c b/drivers/mfd/tlv320aic3xxx-spi.c
index cd0e506f7c47..002af841dd72 100644
--- a/drivers/mfd/tlv320aic3xxx-spi.c
+++ b/drivers/mfd/tlv320aic3xxx-spi.c
@@ -38,7 +38,7 @@ static int aic3xxx_resume(struct device *dev)
 #endif
 
 
-static int __devinit tlv320aic3xxx_spi_probe(struct spi_device *spi)
+static int tlv320aic3xxx_spi_probe(struct spi_device *spi)
 {
 	const struct spi_device_id *id = spi_get_device_id(spi);
 	struct aic3xxx *tlv320aic3xxx;
@@ -80,7 +80,7 @@ static int __devinit tlv320aic3xxx_spi_probe(struct spi_device *spi)
 	return aic3xxx_device_init(tlv320aic3xxx, tlv320aic3xxx->irq);
 }
 
-static int __devexit tlv320aic3xxx_spi_remove(struct spi_device *spi)
+static int tlv320aic3xxx_spi_remove(struct spi_device *spi)
 {
 	struct aic3xxx *tlv320aic3xxx = dev_get_drvdata(&spi->dev);
 	aic3xxx_device_exit(tlv320aic3xxx);
@@ -105,7 +105,7 @@ static struct spi_driver tlv320aic3xxx_spi_driver = {
 		.pm	= &aic3xxx_pm_ops,
 	},
 	.probe		= tlv320aic3xxx_spi_probe,
-	.remove		= __devexit_p(tlv320aic3xxx_spi_remove),
+	.remove		= tlv320aic3xxx_spi_remove,
 	.id_table	= aic3xxx_spi_ids,
 };
 
diff --git a/drivers/misc/max77660-sim.c b/drivers/misc/max77660-sim.c
index 16a0a1c2cd0c..7b5e766335bf 100644
--- a/drivers/misc/max77660-sim.c
+++ b/drivers/misc/max77660-sim.c
@@ -128,7 +128,7 @@ static struct miscdevice sim_miscdev = {
 	.name = "sim",
 };
 
-static int __devinit max77660_sim_probe(struct platform_device *pdev)
+static int max77660_sim_probe(struct platform_device *pdev)
 {
 	struct max77660_platform_data *pdata;
 	struct max77660_sim *sim;
@@ -270,7 +270,7 @@ err_reg_access:
 	return ret;
 }
 
-static int __devexit max77660_sim_remove(struct platform_device *pdev)
+static int max77660_sim_remove(struct platform_device *pdev)
 {
 	struct max77660_sim *sim = platform_get_drvdata(pdev);
 
@@ -284,7 +284,7 @@ static struct platform_driver max77660_sim_driver = {
 	.driver.name	= "max77660-sim",
 	.driver.owner	= THIS_MODULE,
 	.probe		= max77660_sim_probe,
-	.remove		= __devexit_p(max77660_sim_remove),
+	.remove		= max77660_sim_remove,
 };
 
 static int __init max77660_sim_init(void)
diff --git a/drivers/misc/palmas-sim.c b/drivers/misc/palmas-sim.c
index 5ebbabb13110..96ffc79cef9d 100644
--- a/drivers/misc/palmas-sim.c
+++ b/drivers/misc/palmas-sim.c
@@ -141,7 +141,7 @@ static struct miscdevice sim_miscdev = {
 	.name = "sim",
 };
 
-static int __devinit palmas_sim_probe(struct platform_device *pdev)
+static int palmas_sim_probe(struct platform_device *pdev)
 {
 	struct palmas_platform_data *pdata;
 	struct palmas_sim *sim;
@@ -309,7 +309,7 @@ err_reg_access:
 	return ret;
 }
 
-static int __devexit palmas_sim_remove(struct platform_device *pdev)
+static int palmas_sim_remove(struct platform_device *pdev)
 {
 	struct palmas_sim *sim = platform_get_drvdata(pdev);
 
@@ -325,7 +325,7 @@ static struct platform_driver palmas_sim_driver = {
 	.driver.name	= "palmas-sim",
 	.driver.owner	= THIS_MODULE,
 	.probe		= palmas_sim_probe,
-	.remove		= __devexit_p(palmas_sim_remove),
+	.remove		= palmas_sim_remove,
 };
 
 static int __init palmas_sim_init(void)
diff --git a/drivers/misc/tegra-cec/tegra_cec.c b/drivers/misc/tegra-cec/tegra_cec.c
index a368a229375d..18357e3fa6e6 100644
--- a/drivers/misc/tegra-cec/tegra_cec.c
+++ b/drivers/misc/tegra-cec/tegra_cec.c
@@ -236,7 +236,7 @@ static void tegra_cec_init(struct tegra_cec *cec)
 	   cec->cec_base + TEGRA_CEC_INT_MASK);
 }
 
-static int __devinit tegra_cec_probe(struct platform_device *pdev)
+static int tegra_cec_probe(struct platform_device *pdev)
 {
 	struct tegra_cec *cec;
 	struct resource *res;
diff --git a/drivers/misc/therm_est.c b/drivers/misc/therm_est.c
index 17471bfe6aee..247ac7bf4ade 100644
--- a/drivers/misc/therm_est.c
+++ b/drivers/misc/therm_est.c
@@ -694,7 +694,7 @@ static int therm_est_pm_notify(struct notifier_block *nb,
 }
 #endif
 
-static int __devinit therm_est_probe(struct platform_device *pdev)
+static int therm_est_probe(struct platform_device *pdev)
 {
 	int i;
 	struct therm_estimator *est;
@@ -769,7 +769,7 @@ err:
 	return -EINVAL;
 }
 
-static int __devexit therm_est_remove(struct platform_device *pdev)
+static int therm_est_remove(struct platform_device *pdev)
 {
 	struct therm_estimator *est = platform_get_drvdata(pdev);
 	int i;
@@ -794,7 +794,7 @@ static struct platform_driver therm_est_driver = {
 		.name  = "therm_est",
 	},
 	.probe  = therm_est_probe,
-	.remove = __devexit_p(therm_est_remove),
+	.remove = therm_est_remove,
 };
 
 static int __init therm_est_driver_init(void)
diff --git a/drivers/misc/therm_fan_est.c b/drivers/misc/therm_fan_est.c
index 15d6352a915e..f97386d3742d 100644
--- a/drivers/misc/therm_fan_est.c
+++ b/drivers/misc/therm_fan_est.c
@@ -315,7 +315,7 @@ static struct sensor_device_attribute therm_fan_est_nodes[] = {
 	SENSOR_ATTR(temps, S_IRUGO, show_temps, 0, 0),
 };
 
-static int __devinit therm_fan_est_probe(struct platform_device *pdev)
+static int therm_fan_est_probe(struct platform_device *pdev)
 {
 	int i, j;
 	long temp;
@@ -384,7 +384,7 @@ static int __devinit therm_fan_est_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit therm_fan_est_remove(struct platform_device *pdev)
+static int therm_fan_est_remove(struct platform_device *pdev)
 {
 	struct therm_fan_estimator *est = platform_get_drvdata(pdev);
 
@@ -431,7 +431,7 @@ static struct platform_driver therm_fan_est_driver = {
 		.name  = "therm-fan-est",
 	},
 	.probe  = therm_fan_est_probe,
-	.remove = __devexit_p(therm_fan_est_remove),
+	.remove = therm_fan_est_remove,
 #if CONFIG_PM
 	.suspend = therm_fan_est_suspend,
 	.resume = therm_fan_est_resume,
diff --git a/drivers/pinctrl/pinctrl-max77660.c b/drivers/pinctrl/pinctrl-max77660.c
index 9a972195beb0..b64f6f6cb73b 100644
--- a/drivers/pinctrl/pinctrl-max77660.c
+++ b/drivers/pinctrl/pinctrl-max77660.c
@@ -95,7 +95,7 @@ static int max77660_init_pin_gpio_mode(struct device *dev,
 	return ret;
 }
 
-static int __devinit max77660_pinctrl_probe(struct platform_device *pdev)
+static int max77660_pinctrl_probe(struct platform_device *pdev)
 {
 	struct max77660_platform_data *pdata;
 	struct device *parent = pdev->dev.parent;
diff --git a/drivers/pinctrl/pinctrl-palmas.c b/drivers/pinctrl/pinctrl-palmas.c
index a71788fa45ee..6a5525a519dd 100644
--- a/drivers/pinctrl/pinctrl-palmas.c
+++ b/drivers/pinctrl/pinctrl-palmas.c
@@ -421,7 +421,7 @@ static int palmas_set_dvfs2(struct palmas_pinctrl *pinctrl, bool enable)
 	return ret;
 }
 
-static int __devinit palmas_pinctrl_probe(struct platform_device *pdev)
+static int palmas_pinctrl_probe(struct platform_device *pdev)
 {
 	struct palmas_platform_data *pdata;
 	struct palmas_pinctrl_platform_data *pctrl_pdata;
diff --git a/drivers/power/max77660-charger-extcon.c b/drivers/power/max77660-charger-extcon.c
index b8245cc521bf..518c56deaa6a 100644
--- a/drivers/power/max77660-charger-extcon.c
+++ b/drivers/power/max77660-charger-extcon.c
@@ -594,7 +594,7 @@ out:
 	return ret;
 }
 
-static int __devinit max77660_chg_extcon_probe(struct platform_device *pdev)
+static int max77660_chg_extcon_probe(struct platform_device *pdev)
 {
 	struct max77660_chg_extcon *chg_extcon;
 	struct max77660_platform_data *pdata;
@@ -747,7 +747,7 @@ out:
 	return ret;
 }
 
-static int __devexit max77660_chg_extcon_remove(struct platform_device *pdev)
+static int max77660_chg_extcon_remove(struct platform_device *pdev)
 {
 	struct max77660_chg_extcon *chg_extcon = dev_get_drvdata(&pdev->dev);
 
@@ -817,7 +817,7 @@ static const struct dev_pm_ops max77660_pm_ops = {
 
 static struct platform_driver max77660_chg_extcon_driver = {
 	.probe = max77660_chg_extcon_probe,
-	.remove = __devexit_p(max77660_chg_extcon_remove),
+	.remove = max77660_chg_extcon_remove,
 	.driver = {
 		.name = "max77660-charger-extcon",
 		.owner = THIS_MODULE,
diff --git a/drivers/power/palmas_battery.c b/drivers/power/palmas_battery.c
index 09e7514e1cf1..584ba4985e0c 100644
--- a/drivers/power/palmas_battery.c
+++ b/drivers/power/palmas_battery.c
@@ -1483,7 +1483,7 @@ static int palmas_current_setup(struct palmas_battery_info *di,
 	return ret;
 }
 
-static __devinit int palmas_battery_probe(struct platform_device *pdev)
+static int palmas_battery_probe(struct platform_device *pdev)
 {
 	struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
 	struct palmas_platform_data *palmas_pdata;
@@ -1630,7 +1630,7 @@ err:
 	return ret;
 }
 
-static int __devexit palmas_battery_remove(struct platform_device *pdev)
+static int palmas_battery_remove(struct platform_device *pdev)
 {
 	struct palmas_battery_info *di = platform_get_drvdata(pdev);
 	struct palmas *palmas = di->palmas;
@@ -1648,7 +1648,7 @@ static int __devexit palmas_battery_remove(struct platform_device *pdev)
 
 static struct platform_driver palmas_battery_driver = {
 	.probe = palmas_battery_probe,
-	.remove = __devexit_p(palmas_battery_remove),
+	.remove = palmas_battery_remove,
 	.driver = {
 		.name = "palmas-battery-gauge",
 		.owner = THIS_MODULE,
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 1bca1517ae09..2bae19114a11 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -164,7 +164,7 @@ error:
 	return IRQ_HANDLED;
 }
 
-static __devinit int tps65090_charger_probe(struct platform_device *pdev)
+static int tps65090_charger_probe(struct platform_device *pdev)
 {
 	uint8_t retval = 0;
 	int ret;
@@ -260,7 +260,7 @@ fail_suppy_reg:
 	return ret;
 }
 
-static int __devexit tps65090_charger_remove(struct platform_device *pdev)
+static int tps65090_charger_remove(struct platform_device *pdev)
 {
 	struct tps65090_charger *charger = dev_get_drvdata(&pdev->dev);
 
@@ -275,7 +275,7 @@ static struct platform_driver tps65090_charger_driver = {
 		.owner	= THIS_MODULE,
 	},
 	.probe	= tps65090_charger_probe,
-	.remove = __devexit_p(tps65090_charger_remove),
+	.remove = tps65090_charger_remove,
 };
 
 module_platform_driver(tps65090_charger_driver);
diff --git a/drivers/regulator/max77660-regulator.c b/drivers/regulator/max77660-regulator.c
index c7babf445259..8521dbaa80af 100644
--- a/drivers/regulator/max77660-regulator.c
+++ b/drivers/regulator/max77660-regulator.c
@@ -1096,7 +1096,7 @@ static int max77660_regulator_remove(struct platform_device *pdev)
 
 static struct platform_driver max77660_regulator_driver = {
 	.probe = max77660_regulator_probe,
-	.remove = __devexit_p(max77660_regulator_remove),
+	.remove = max77660_regulator_remove,
 	.driver = {
 		.name = "max77660-pmic",
 		.owner = THIS_MODULE,
diff --git a/drivers/rtc/rtc-max77660.c b/drivers/rtc/rtc-max77660.c
index 2d965d7f122d..693cb8e8f29b 100644
--- a/drivers/rtc/rtc-max77660.c
+++ b/drivers/rtc/rtc-max77660.c
@@ -295,7 +295,7 @@ static int max77660_rtc_preinit(struct max77660_rtc *rtc)
 	return 0;
 }
 
-static int __devinit max77660_rtc_probe(struct platform_device *pdev)
+static int max77660_rtc_probe(struct platform_device *pdev)
 {
 	static struct max77660_rtc *rtc;
 	int ret;
@@ -344,7 +344,7 @@ out:
 	return ret;
 }
 
-static int __devexit max77660_rtc_remove(struct platform_device *pdev)
+static int max77660_rtc_remove(struct platform_device *pdev)
 {
 	struct max77660_rtc *rtc = dev_get_drvdata(&pdev->dev);
 
@@ -405,7 +405,7 @@ static const struct dev_pm_ops max77660_pm_ops = {
 
 static struct platform_driver max77660_rtc_driver = {
 	.probe = max77660_rtc_probe,
-	.remove = __devexit_p(max77660_rtc_remove),
+	.remove = max77660_rtc_remove,
 	.driver = {
 		.name = "max77660-rtc",
 		.owner = THIS_MODULE,
diff --git a/drivers/rtc/rtc-palmas.c b/drivers/rtc/rtc-palmas.c
index a2a9883ee6c0..fe98035433eb 100644
--- a/drivers/rtc/rtc-palmas.c
+++ b/drivers/rtc/rtc-palmas.c
@@ -301,7 +301,7 @@ static struct rtc_class_ops palmas_rtc_ops = {
 	.alarm_irq_enable = palmas_rtc_alarm_irq_enable,
 };
 
-static int __devinit palmas_rtc_probe(struct platform_device *pdev)
+static int palmas_rtc_probe(struct platform_device *pdev)
 {
 	struct palmas *palmas = NULL;
 	struct palmas_rtc *palmas_rtc = NULL;
@@ -416,7 +416,7 @@ static int __devinit palmas_rtc_probe(struct platform_device *pdev)
  * Disable all palmas RTC module interrupts.
  * Sets status flag to free.
  */
-static int __devexit palmas_rtc_remove(struct platform_device *pdev)
+static int palmas_rtc_remove(struct platform_device *pdev)
 {
 	/* leave rtc running, but disable irqs */
 	struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
@@ -482,7 +482,7 @@ static const struct dev_pm_ops palmas_rtc_pm_ops = {
 
 static struct platform_driver palmas_rtc_driver = {
 	.probe		= palmas_rtc_probe,
-	.remove		= __devexit_p(palmas_rtc_remove),
+	.remove		= palmas_rtc_remove,
 	.driver		= {
 		.owner	= THIS_MODULE,
 		.name	= "palmas-rtc",
diff --git a/drivers/staging/iio/adc/max77660-adc.c b/drivers/staging/iio/adc/max77660-adc.c
index e39939fad41c..d8224d526184 100644
--- a/drivers/staging/iio/adc/max77660-adc.c
+++ b/drivers/staging/iio/adc/max77660-adc.c
@@ -325,7 +325,7 @@ static const struct iio_chan_spec max77660_adc_iio_channel[] = {
 	MAX77660_ADC_CHAN_IIO(ADC3),
 };
 
-static int __devinit max77660_adc_probe(struct platform_device *pdev)
+static int max77660_adc_probe(struct platform_device *pdev)
 {
 	struct max77660_adc *adc;
 	struct max77660_platform_data *pdata;
@@ -406,7 +406,7 @@ out:
 	return ret;
 }
 
-static int __devexit max77660_adc_remove(struct platform_device *pdev)
+static int max77660_adc_remove(struct platform_device *pdev)
 {
 	struct iio_dev *iodev = dev_to_iio_dev(&pdev->dev);
 	struct max77660_adc *adc = iio_priv(iodev);
@@ -446,7 +446,7 @@ static const struct dev_pm_ops max77660_pm_ops = {
 
 static struct platform_driver max77660_adc_driver = {
 	.probe = max77660_adc_probe,
-	.remove = __devexit_p(max77660_adc_remove),
+	.remove = max77660_adc_remove,
 	.driver = {
 		.name = "max77660-adc",
 		.owner = THIS_MODULE,
diff --git a/drivers/staging/iio/adc/palmas_gpadc.c b/drivers/staging/iio/adc/palmas_gpadc.c
index 0fb697fdd4fe..a0b4a6a45b35 100644
--- a/drivers/staging/iio/adc/palmas_gpadc.c
+++ b/drivers/staging/iio/adc/palmas_gpadc.c
@@ -365,7 +365,7 @@ static struct iio_map palmas_iio_map[] = {
 	PALMAS_GPADC_IIO_MAP(IN6, "palmas-battery", "vbat_channel"),
 };
 
-static int __devinit palmas_gpadc_probe(struct platform_device *pdev)
+static int palmas_gpadc_probe(struct platform_device *pdev)
 {
 	struct palmas_gpadc *adc;
 	struct palmas_platform_data *pdata;
@@ -456,7 +456,7 @@ out:
 	return ret;
 }
 
-static int __devexit palmas_gpadc_remove(struct platform_device *pdev)
+static int palmas_gpadc_remove(struct platform_device *pdev)
 {
 	struct iio_dev *iodev = dev_to_iio_dev(&pdev->dev);
 	struct palmas_gpadc *adc = iio_priv(iodev);
@@ -496,7 +496,7 @@ static const struct dev_pm_ops palmas_pm_ops = {
 
 static struct platform_driver palmas_gpadc_driver = {
 	.probe = palmas_gpadc_probe,
-	.remove = __devexit_p(palmas_gpadc_remove),
+	.remove = palmas_gpadc_remove,
 	.driver = {
 		.name = MOD_NAME,
 		.owner = THIS_MODULE,
diff --git a/drivers/staging/iio/light/cm3218.c b/drivers/staging/iio/light/cm3218.c
index ea5f170c90ff..ed8f633aa463 100644
--- a/drivers/staging/iio/light/cm3218.c
+++ b/drivers/staging/iio/light/cm3218.c
@@ -522,7 +522,7 @@ static void cm3218_shutdown(struct i2c_client *client)
 	mutex_unlock(&chip->lock);
 }
 
-static int __devexit cm3218_remove(struct i2c_client *client)
+static int cm3218_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 	struct cm3218_chip *chip = iio_priv(indio_dev);
@@ -555,7 +555,7 @@ static struct i2c_driver cm3218_driver = {
 	},
 	.id_table = cm3218_id,
 	.probe = cm3218_probe,
-	.remove = __devexit_p(cm3218_remove),
+	.remove = cm3218_remove,
 	.shutdown = cm3218_shutdown,
 };
 
diff --git a/drivers/staging/iio/light/tcs3772.c b/drivers/staging/iio/light/tcs3772.c
index 29bc7908fdf5..cb1336f90370 100644
--- a/drivers/staging/iio/light/tcs3772.c
+++ b/drivers/staging/iio/light/tcs3772.c
@@ -639,7 +639,7 @@ static void tcs3772_shutdown(struct i2c_client *client)
 	mutex_unlock(&chip->lock);
 }
 
-static int __devexit tcs3772_remove(struct i2c_client *client)
+static int tcs3772_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 	struct tcs3772_chip *chip = iio_priv(indio_dev);
@@ -672,7 +672,7 @@ static struct i2c_driver tcs3772_driver = {
 	},
 	.id_table = tcs3772_id,
 	.probe = tcs3772_probe,
-	.remove = __devexit_p(tcs3772_remove),
+	.remove = tcs3772_remove,
 	.shutdown = tcs3772_shutdown,
 };
 
diff --git a/drivers/video/backlight/lm3528_bl.c b/drivers/video/backlight/lm3528_bl.c
index c52c90d176aa..4ffc4f0cef4a 100644
--- a/drivers/video/backlight/lm3528_bl.c
+++ b/drivers/video/backlight/lm3528_bl.c
@@ -166,7 +166,7 @@ static int lm3528_bl_probe(struct i2c_client *i2c,
 	return 0;
 }
 
-static int __devexit lm3528_bl_remove(struct i2c_client *cl)
+static int lm3528_bl_remove(struct i2c_client *cl)
 {
 	struct lm3528_backlight_data *data = i2c_get_clientdata(cl);
 	data->bl->props.brightness = 0;
@@ -211,7 +211,7 @@ static struct i2c_driver lm3528_bl_driver = {
 	},
 	.id_table = lm3528_id,
 	.probe	= lm3528_bl_probe,
-	.remove	= __devexit_p(lm3528_bl_remove),
+	.remove	= lm3528_bl_remove,
 };
 module_i2c_driver(lm3528_bl_driver);
 
diff --git a/drivers/watchdog/max77660_sys_wdt.c b/drivers/watchdog/max77660_sys_wdt.c
index 082eea715e26..ff9b5bd99366 100644
--- a/drivers/watchdog/max77660_sys_wdt.c
+++ b/drivers/watchdog/max77660_sys_wdt.c
@@ -179,7 +179,7 @@ static const struct watchdog_ops max77660_sys_wdt_ops = {
 	.set_timeout = max77660_sys_wdt_set_timeout,
 };
 
-static int __devinit max77660_sys_wdt_probe(struct platform_device *pdev)
+static int max77660_sys_wdt_probe(struct platform_device *pdev)
 {
 	struct max77660_platform_data *pdata;
 	struct max77660_sys_wdt *wdt;
@@ -289,7 +289,7 @@ scrub:
 	return ret;
 }
 
-static int __devexit max77660_sys_wdt_remove(struct platform_device *pdev)
+static int max77660_sys_wdt_remove(struct platform_device *pdev)
 {
 	struct max77660_sys_wdt *wdt = platform_get_drvdata(pdev);
 
@@ -355,7 +355,7 @@ static struct platform_driver max77660_sys_wdt_driver = {
 		.pm = &max77660_sys_wdt_pm_ops,
 	},
 	.probe	= max77660_sys_wdt_probe,
-	.remove	= __devexit_p(max77660_sys_wdt_remove),
+	.remove	= max77660_sys_wdt_remove,
 };
 
 static int __init max77660_sys_wdt_init(void)
diff --git a/drivers/watchdog/palmas_wdt.c b/drivers/watchdog/palmas_wdt.c
index d85dfee5d09d..3d15bde9938b 100644
--- a/drivers/watchdog/palmas_wdt.c
+++ b/drivers/watchdog/palmas_wdt.c
@@ -132,7 +132,7 @@ static const struct watchdog_ops palmas_wdt_ops = {
 	.set_timeout = palmas_wdt_set_timeout,
 };
 
-static int __devinit palmas_wdt_probe(struct platform_device *pdev)
+static int palmas_wdt_probe(struct platform_device *pdev)
 {
 	struct palmas_platform_data *pdata;
 	struct palmas_wdt *wdt;
@@ -230,7 +230,7 @@ scrub:
 	return ret;
 }
 
-static int __devexit palmas_wdt_remove(struct platform_device *pdev)
+static int palmas_wdt_remove(struct platform_device *pdev)
 {
 	struct palmas_wdt *wdt = platform_get_drvdata(pdev);
 
@@ -283,7 +283,7 @@ static struct platform_driver palmas_wdt_driver = {
 		.pm = &palmas_wdt_pm_ops,
 	},
 	.probe	= palmas_wdt_probe,
-	.remove	= __devexit_p(palmas_wdt_remove),
+	.remove	= palmas_wdt_remove,
 };
 
 static int __init palmas_wdt_init(void)