diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
index 700d5e0442eacc1dfe2dcca66022e1b93977e98b..6119ff8e8c87597da85afa4eb4edda34c77b4b76 100644
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@ -1434,7 +1434,7 @@ static int abituguru_probe(struct platform_device *pdev)
 	return res;
 }
 
-static int __devexit abituguru_remove(struct platform_device *pdev)
+static int abituguru_remove(struct platform_device *pdev)
 {
 	int i;
 	struct abituguru_data *data = platform_get_drvdata(pdev);
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index b8d0942a987223558e97dd1b5843d217d29936ff..205327d33c4d5f81a3cef918624b42d1f34f0c92 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -1072,7 +1072,7 @@ static int abituguru3_probe(struct platform_device *pdev)
 	return res;
 }
 
-static int __devexit abituguru3_remove(struct platform_device *pdev)
+static int abituguru3_remove(struct platform_device *pdev)
 {
 	int i;
 	struct abituguru3_data *data = platform_get_drvdata(pdev);
diff --git a/drivers/hwmon/ad7314.c b/drivers/hwmon/ad7314.c
index defd34b04629c9a6ba6ada3cb6fb785b0d5a6c07..a57584d28a404036589a50dec3aac202072dd45d 100644
--- a/drivers/hwmon/ad7314.c
+++ b/drivers/hwmon/ad7314.c
@@ -135,7 +135,7 @@ static int ad7314_probe(struct spi_device *spi_dev)
 	return ret;
 }
 
-static int __devexit ad7314_remove(struct spi_device *spi_dev)
+static int ad7314_remove(struct spi_device *spi_dev)
 {
 	struct ad7314_data *chip = dev_get_drvdata(&spi_dev->dev);
 
diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c
index 20276ca37ed85574ef35ad284496d95f512a04b6..f3a5d4764eb95be740066d7aaf94ea2a5db3c0a2 100644
--- a/drivers/hwmon/ad7414.c
+++ b/drivers/hwmon/ad7414.c
@@ -226,7 +226,7 @@ static int ad7414_probe(struct i2c_client *client,
 	return err;
 }
 
-static int __devexit ad7414_remove(struct i2c_client *client)
+static int ad7414_remove(struct i2c_client *client)
 {
 	struct ad7414_data *data = i2c_get_clientdata(client);
 
diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c
index ecc1e6c5fa9f11099b3b095cc23514cbd3355deb..751b1f0264a4dae9a76f49de823c807bcac022fe 100644
--- a/drivers/hwmon/adcxx.c
+++ b/drivers/hwmon/adcxx.c
@@ -208,7 +208,7 @@ static int adcxx_probe(struct spi_device *spi)
 	return status;
 }
 
-static int __devexit adcxx_remove(struct spi_device *spi)
+static int adcxx_remove(struct spi_device *spi)
 {
 	struct adcxx *adc = spi_get_drvdata(spi);
 	int i;
diff --git a/drivers/hwmon/ads7871.c b/drivers/hwmon/ads7871.c
index 41a7837585fcd93191e0311f2adce138f9fcd4fc..a79875986f911a62d4aeb8fd61a4081dff2d9356 100644
--- a/drivers/hwmon/ads7871.c
+++ b/drivers/hwmon/ads7871.c
@@ -225,7 +225,7 @@ static int ads7871_probe(struct spi_device *spi)
 	return err;
 }
 
-static int __devexit ads7871_remove(struct spi_device *spi)
+static int ads7871_remove(struct spi_device *spi)
 {
 	struct ads7871_data *pdata = spi_get_drvdata(spi);
 
diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c
index 68a5da71566297cb2b82072a6ca2cda449d2e0a9..34ff03abb50bdff5a8b87a207733d273959cc628 100644
--- a/drivers/hwmon/adt7411.c
+++ b/drivers/hwmon/adt7411.c
@@ -317,7 +317,7 @@ static int adt7411_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int __devexit adt7411_remove(struct i2c_client *client)
+static int adt7411_remove(struct i2c_client *client)
 {
 	struct adt7411_data *data = i2c_get_clientdata(client);
 
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 65a3746319957a754acc3c4e501a4f7e4e21a4eb..001e22c604639be7076c40667eaf33cc5794d669 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -586,7 +586,7 @@ static int coretemp_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit coretemp_remove(struct platform_device *pdev)
+static int coretemp_remove(struct platform_device *pdev)
 {
 	struct platform_data *pdata = platform_get_drvdata(pdev);
 	int i;
diff --git a/drivers/hwmon/da9052-hwmon.c b/drivers/hwmon/da9052-hwmon.c
index d3206e341de2cc494863cae8a645e45be055cb81..aca7f0c7ff79b9bea9ecc9aadbff60b59eb47998 100644
--- a/drivers/hwmon/da9052-hwmon.c
+++ b/drivers/hwmon/da9052-hwmon.c
@@ -316,7 +316,7 @@ static int da9052_hwmon_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit da9052_hwmon_remove(struct platform_device *pdev)
+static int da9052_hwmon_remove(struct platform_device *pdev)
 {
 	struct da9052_hwmon *hwmon = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index aa6a493731bfe412ae1e13f0a0c76794486e5155..7430f70ae452958b5a1bdbd8be308fdbf5a2e405 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -2718,7 +2718,7 @@ static int dme1737_isa_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit dme1737_isa_remove(struct platform_device *pdev)
+static int dme1737_isa_remove(struct platform_device *pdev)
 {
 	struct dme1737_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 0c8426eea6a6bdb68d7691cbce6318f6c3963c48..a9816979c5dec92f4f0638c6b65f46fe6b801429 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -1490,7 +1490,7 @@ static int f71805f_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit f71805f_remove(struct platform_device *pdev)
+static int f71805f_remove(struct platform_device *pdev)
 {
 	struct f71805f_data *data = platform_get_drvdata(pdev);
 	int i;
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 4eca29850286d055e9e67137049d9877ac100579..5cec685f1b79a31ae9ed39283961496bad7667a3 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -235,7 +235,7 @@ static int fam15h_power_probe(struct pci_dev *pdev,
 	return err;
 }
 
-static void __devexit fam15h_power_remove(struct pci_dev *pdev)
+static void fam15h_power_remove(struct pci_dev *pdev)
 {
 	struct device *dev;
 	struct fam15h_power_data *data;
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index 0f46cca6179a42bd5bf1f4626569cf4badb3eacb..4e04c1228e51e56bac4740051d8466dd150d1c9c 100644
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -581,7 +581,7 @@ static int gpio_fan_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit gpio_fan_remove(struct platform_device *pdev)
+static int gpio_fan_remove(struct platform_device *pdev)
 {
 	struct gpio_fan_data *fan_data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c
index 5c65aef095ca32cbe77a33213ede4c8c62dc1ac5..2dc37c7c6947cfa6dd5fde0e72ff5701f7162dd0 100644
--- a/drivers/hwmon/hih6130.c
+++ b/drivers/hwmon/hih6130.c
@@ -263,7 +263,7 @@ static int hih6130_probe(struct i2c_client *client,
  * hih6130_remove() - remove device
  * @client: I2C client device
  */
-static int __devexit hih6130_remove(struct i2c_client *client)
+static int hih6130_remove(struct i2c_client *client)
 {
 	struct hih6130 *hih6130 = i2c_get_clientdata(client);
 
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c
index f3bc723c930c71c8bfdf17eb319b21fce2380fa6..b87c2ccee06b39196b1be67ea43cacbf8066e499 100644
--- a/drivers/hwmon/i5k_amb.c
+++ b/drivers/hwmon/i5k_amb.c
@@ -564,7 +564,7 @@ static int i5k_amb_probe(struct platform_device *pdev)
 	return res;
 }
 
-static int __devexit i5k_amb_remove(struct platform_device *pdev)
+static int i5k_amb_remove(struct platform_device *pdev)
 {
 	int i;
 	struct i5k_amb_data *data = platform_get_drvdata(pdev);
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 3a4da44f704f7bc494732e1ea42164c96de7854f..d32aa354cbdf8d50335249427ac2453ce80401ed 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -428,7 +428,7 @@ static inline int has_old_autopwm(const struct it87_data *data)
 }
 
 static int it87_probe(struct platform_device *pdev);
-static int __devexit it87_remove(struct platform_device *pdev);
+static int it87_remove(struct platform_device *pdev);
 
 static int it87_read_value(struct it87_data *data, u8 reg);
 static void it87_write_value(struct it87_data *data, u8 reg, u8 value);
@@ -2158,7 +2158,7 @@ static int it87_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit it87_remove(struct platform_device *pdev)
+static int it87_remove(struct platform_device *pdev)
 {
 	struct it87_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
index b944d615944ba8ebb1fff87f8dc319276a476353..e0d66b9590abd21d91440abe3fc7015dc21f4276 100644
--- a/drivers/hwmon/jz4740-hwmon.c
+++ b/drivers/hwmon/jz4740-hwmon.c
@@ -172,7 +172,7 @@ static int jz4740_hwmon_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit jz4740_hwmon_remove(struct platform_device *pdev)
+static int jz4740_hwmon_remove(struct platform_device *pdev)
 {
 	struct jz4740_hwmon *hwmon = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index da8acda48ab0a7073d606a9675c420999787ae77..e3b037c73a7eef2ce54249a99564e12d63690a26 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -192,7 +192,7 @@ static int k10temp_probe(struct pci_dev *pdev,
 	return err;
 }
 
-static void __devexit k10temp_remove(struct pci_dev *pdev)
+static void k10temp_remove(struct pci_dev *pdev)
 {
 	hwmon_device_unregister(pci_get_drvdata(pdev));
 	device_remove_file(&pdev->dev, &dev_attr_name);
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index 8c46753158dfa262cfaf1b74eebf1adffc1be9d0..9f3c0aeacdb97bb45c927b880ed5bcae36e6ed0f 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -304,7 +304,7 @@ static int k8temp_probe(struct pci_dev *pdev,
 	return err;
 }
 
-static void __devexit k8temp_remove(struct pci_dev *pdev)
+static void k8temp_remove(struct pci_dev *pdev)
 {
 	struct k8temp_data *data = pci_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c
index d5f006e67a514aa90ed6da44888b2b0f0fc9f975..016efa26ba7ca48e80733d949745010190416951 100644
--- a/drivers/hwmon/lm70.c
+++ b/drivers/hwmon/lm70.c
@@ -178,7 +178,7 @@ static int lm70_probe(struct spi_device *spi)
 	return status;
 }
 
-static int __devexit lm70_remove(struct spi_device *spi)
+static int lm70_remove(struct spi_device *spi)
 {
 	struct lm70 *p_lm70 = spi_get_drvdata(spi);
 
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 181d756badc595cbc81b252e7c9c9968af051574..53d6ee8ffa3370e9cfc1e60049d9704e2eb5a7f2 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -886,7 +886,7 @@ static int lm78_isa_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit lm78_isa_remove(struct platform_device *pdev)
+static int lm78_isa_remove(struct platform_device *pdev)
 {
 	struct lm78_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c
index 410351bcc3e3d17f18141049c7b99cc448a42caa..eda077de8a9f726dd956f48e7e909fcc6ea8f148 100644
--- a/drivers/hwmon/max1111.c
+++ b/drivers/hwmon/max1111.c
@@ -256,7 +256,7 @@ static int max1111_probe(struct spi_device *spi)
 	return err;
 }
 
-static int __devexit max1111_remove(struct spi_device *spi)
+static int max1111_remove(struct spi_device *spi)
 {
 	struct max1111_data *data = spi_get_drvdata(spi);
 
diff --git a/drivers/hwmon/max197.c b/drivers/hwmon/max197.c
index 76c941e0b95fe6c608260f4d31221a7cac7fd367..b5ebb9198c757e17eaf114d5cf15f7c91a28e14f 100644
--- a/drivers/hwmon/max197.c
+++ b/drivers/hwmon/max197.c
@@ -316,7 +316,7 @@ static int max197_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit max197_remove(struct platform_device *pdev)
+static int max197_remove(struct platform_device *pdev)
 {
 	struct max197_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/mc13783-adc.c b/drivers/hwmon/mc13783-adc.c
index 50032ee45a3b29f62aec0bea67d481283f48dad3..2a7f331cd3c012a48652fffed43c458482ec2f89 100644
--- a/drivers/hwmon/mc13783-adc.c
+++ b/drivers/hwmon/mc13783-adc.c
@@ -233,7 +233,7 @@ static int __init mc13783_adc_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit mc13783_adc_remove(struct platform_device *pdev)
+static int mc13783_adc_remove(struct platform_device *pdev)
 {
 	struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
 	kernel_ulong_t driver_data = platform_get_device_id(pdev)->driver_data;
diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c
index ac4f403bc61827f3a5e0e9dccc540940039a67d3..a87eb8986e360d66cebc31fca6e9ba90af32b538 100644
--- a/drivers/hwmon/ntc_thermistor.c
+++ b/drivers/hwmon/ntc_thermistor.c
@@ -393,7 +393,7 @@ static int ntc_thermistor_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit ntc_thermistor_remove(struct platform_device *pdev)
+static int ntc_thermistor_remove(struct platform_device *pdev)
 {
 	struct ntc_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index b4c11c6ac677369cd61e64e52fa5505fc6c39b2c..e35856bb79b4d69096a452360e3f7973c7b9c1f3 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -228,7 +228,7 @@ struct pc87360_data {
  */
 
 static int pc87360_probe(struct platform_device *pdev);
-static int __devexit pc87360_remove(struct platform_device *pdev);
+static int pc87360_remove(struct platform_device *pdev);
 
 static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
 			      u8 reg);
@@ -1375,7 +1375,7 @@ static int pc87360_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit pc87360_remove(struct platform_device *pdev)
+static int pc87360_remove(struct platform_device *pdev)
 {
 	struct pc87360_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c
index 36a0d177caf378300214e3c6a377401c40eba7e1..6086ad039d7d3e4968a26943315ebf6683e10a51 100644
--- a/drivers/hwmon/pc87427.c
+++ b/drivers/hwmon/pc87427.c
@@ -1141,7 +1141,7 @@ static int pc87427_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit pc87427_remove(struct platform_device *pdev)
+static int pc87427_remove(struct platform_device *pdev)
 {
 	struct pc87427_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c
index 397e2ada61c2310244d0eb00b15ba8792d568685..ff2ae0252a48b048d9e4844efa5182c53b1e6188 100644
--- a/drivers/hwmon/s3c-hwmon.c
+++ b/drivers/hwmon/s3c-hwmon.c
@@ -364,7 +364,7 @@ static int s3c_hwmon_probe(struct platform_device *dev)
 	return ret;
 }
 
-static int __devexit s3c_hwmon_remove(struct platform_device *dev)
+static int s3c_hwmon_remove(struct platform_device *dev)
 {
 	struct s3c_hwmon *hwmon = platform_get_drvdata(dev);
 	int i;
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index d5b79e7dbedc0aa14c99a37e99d7e5d51a303406..1c85d39df171670a4727cb95484d3cd5acbf5721 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -1002,7 +1002,7 @@ static int sht15_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit sht15_remove(struct platform_device *pdev)
+static int sht15_remove(struct platform_device *pdev)
 {
 	struct sht15_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/sht21.c b/drivers/hwmon/sht21.c
index 9a4cc3b5ae0cffa1f7e9ae8722b1834c3220bf33..2e9f9570b6f8c83bf5f55d572ab1eaa8a46d7d42 100644
--- a/drivers/hwmon/sht21.c
+++ b/drivers/hwmon/sht21.c
@@ -233,7 +233,7 @@ static int sht21_probe(struct i2c_client *client,
  * sht21_remove() - remove device
  * @client: I2C client device
  */
-static int __devexit sht21_remove(struct i2c_client *client)
+static int sht21_remove(struct i2c_client *client)
 {
 	struct sht21 *sht21 = i2c_get_clientdata(client);
 
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index e84836bcb6c83cabbeabb46a84019a125a42794c..06ce3c911db9bbc1bdc1169ec420a79b3b818f55 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -204,7 +204,7 @@ struct sis5595_data {
 static struct pci_dev *s_bridge;	/* pointer to the (only) sis5595 */
 
 static int sis5595_probe(struct platform_device *pdev);
-static int __devexit sis5595_remove(struct platform_device *pdev);
+static int sis5595_remove(struct platform_device *pdev);
 
 static int sis5595_read_value(struct sis5595_data *data, u8 reg);
 static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value);
@@ -659,7 +659,7 @@ static int sis5595_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit sis5595_remove(struct platform_device *pdev)
+static int sis5595_remove(struct platform_device *pdev)
 {
 	struct sis5595_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 9100a2748850b854d389e1e6a46932174c1ebc5b..81348fadf3b67b2deb3ef89a8a1294d344276239 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -228,7 +228,7 @@ static const struct attribute_group smsc47b397_group = {
 	.attrs = smsc47b397_attributes,
 };
 
-static int __devexit smsc47b397_remove(struct platform_device *pdev)
+static int smsc47b397_remove(struct platform_device *pdev)
 {
 	struct smsc47b397_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index bd8e4af6fd4254fb837747b7afc60e20a01ba058..b10c3d36ccbc3b8b77410701b763b2890ed5467d 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -216,7 +216,7 @@ static int tmp102_probe(struct i2c_client *client,
 	return status;
 }
 
-static int __devexit tmp102_remove(struct i2c_client *client)
+static int tmp102_remove(struct i2c_client *client)
 {
 	struct tmp102 *tmp102 = i2c_get_clientdata(client);
 
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c
index 6b42f415c5cd74694bed9d068e816db994636849..149d44a7c5842534988d122595b0a841f6f92f42 100644
--- a/drivers/hwmon/twl4030-madc-hwmon.c
+++ b/drivers/hwmon/twl4030-madc-hwmon.c
@@ -120,7 +120,7 @@ static int twl4030_madc_hwmon_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit twl4030_madc_hwmon_remove(struct platform_device *pdev)
+static int twl4030_madc_hwmon_remove(struct platform_device *pdev)
 {
 	hwmon_device_unregister(&pdev->dev);
 	sysfs_remove_group(&pdev->dev.kobj, &twl4030_madc_group);
diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c
index 4a06fc0163160d683e570f9bda595df1c5cc39c9..fb3e69341c1bd72f82280c3904b891490a183132 100644
--- a/drivers/hwmon/ultra45_env.c
+++ b/drivers/hwmon/ultra45_env.c
@@ -291,7 +291,7 @@ static int env_probe(struct platform_device *op)
 	goto out;
 }
 
-static int __devexit env_remove(struct platform_device *op)
+static int env_remove(struct platform_device *op)
 {
 	struct env *p = platform_get_drvdata(op);
 
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index b86ad796fa86dfabb64c6218c850a67001d3525e..76f157b568ed7ac245ef9aaaf23436edef4e4ba2 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -192,7 +192,7 @@ static int via_cputemp_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit via_cputemp_remove(struct platform_device *pdev)
+static int via_cputemp_remove(struct platform_device *pdev)
 {
 	struct via_cputemp_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 9d6e27e8c0f50aab891dac28ef9cb6146f54f720..e0e14a9f1658b4d01bb6871aa4b29ae9d8cb627a 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -339,7 +339,7 @@ struct via686a_data {
 static struct pci_dev *s_bridge;	/* pointer to the (only) via686a */
 
 static int via686a_probe(struct platform_device *pdev);
-static int __devexit via686a_remove(struct platform_device *pdev);
+static int via686a_remove(struct platform_device *pdev);
 
 static inline int via686a_read_value(struct via686a_data *data, u8 reg)
 {
@@ -728,7 +728,7 @@ static int via686a_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit via686a_remove(struct platform_device *pdev)
+static int via686a_remove(struct platform_device *pdev)
 {
 	struct via686a_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c
index ae02edb50c32a822700b4ac32c2676a7087ff836..751703059faeff1910b96d06985eb194af75ebf8 100644
--- a/drivers/hwmon/vt1211.c
+++ b/drivers/hwmon/vt1211.c
@@ -1217,7 +1217,7 @@ static int vt1211_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit vt1211_remove(struct platform_device *pdev)
+static int vt1211_remove(struct platform_device *pdev)
 {
 	struct vt1211_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index a86ef1b192093c7050b00eefa47912343445f787..a56355cef184863fc1a9aadeffb83908ba7bfead 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -176,7 +176,7 @@ struct vt8231_data {
 
 static struct pci_dev *s_bridge;
 static int vt8231_probe(struct platform_device *pdev);
-static int __devexit vt8231_remove(struct platform_device *pdev);
+static int vt8231_remove(struct platform_device *pdev);
 static struct vt8231_data *vt8231_update_device(struct device *dev);
 static void vt8231_init_device(struct vt8231_data *data);
 
@@ -851,7 +851,7 @@ static int vt8231_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit vt8231_remove(struct platform_device *pdev)
+static int vt8231_remove(struct platform_device *pdev)
 {
 	struct vt8231_data *data = platform_get_drvdata(pdev);
 	int i;
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 09e17ff6163cfbb3e2ebe8718312a96627748831..55ac41c055610a862e5cc26369b47b595bdd426d 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -2596,7 +2596,7 @@ static int w83627ehf_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit w83627ehf_remove(struct platform_device *pdev)
+static int w83627ehf_remove(struct platform_device *pdev)
 {
 	struct w83627ehf_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index e5a7e529448952a41a2e052f37aaf5a87383c31f..7f68b8309d1057fd181d93db63e21ac21cfceb2e 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -393,7 +393,7 @@ struct w83627hf_data {
 
 
 static int w83627hf_probe(struct platform_device *pdev);
-static int __devexit w83627hf_remove(struct platform_device *pdev);
+static int w83627hf_remove(struct platform_device *pdev);
 
 static int w83627hf_read_value(struct w83627hf_data *data, u16 reg);
 static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value);
@@ -1508,7 +1508,7 @@ static int w83627hf_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit w83627hf_remove(struct platform_device *pdev)
+static int w83627hf_remove(struct platform_device *pdev)
 {
 	struct w83627hf_data *data = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 54674a51960f5629ab6e32996b771d72ab8c93aa..93bd286395955ccc90cb79bd8c8f445489ed6362 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1824,7 +1824,7 @@ w83781d_isa_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit
+static int
 w83781d_isa_remove(struct platform_device *pdev)
 {
 	struct w83781d_data *data = platform_get_drvdata(pdev);
diff --git a/drivers/hwmon/wm831x-hwmon.c b/drivers/hwmon/wm831x-hwmon.c
index 81e71663ba4eb5b11da70331cbfdfccc04365e4c..df6ceaf8d58a709c1c96c67b87cc6c9a2810d578 100644
--- a/drivers/hwmon/wm831x-hwmon.c
+++ b/drivers/hwmon/wm831x-hwmon.c
@@ -189,7 +189,7 @@ static int wm831x_hwmon_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit wm831x_hwmon_remove(struct platform_device *pdev)
+static int wm831x_hwmon_remove(struct platform_device *pdev)
 {
 	struct wm831x_hwmon *hwmon = platform_get_drvdata(pdev);
 
diff --git a/drivers/hwmon/wm8350-hwmon.c b/drivers/hwmon/wm8350-hwmon.c
index 1fd641789d0f164ed27af31fd416d4659973b9f0..64bf75c9442b00171dd0b5e553695b50c98428e4 100644
--- a/drivers/hwmon/wm8350-hwmon.c
+++ b/drivers/hwmon/wm8350-hwmon.c
@@ -114,7 +114,7 @@ static int wm8350_hwmon_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit wm8350_hwmon_remove(struct platform_device *pdev)
+static int wm8350_hwmon_remove(struct platform_device *pdev)
 {
 	struct wm8350 *wm8350 = platform_get_drvdata(pdev);