Skip to content

Commit

Permalink
hwmon: remove use of __devexit
Browse files Browse the repository at this point in the history 
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Alistair John Strachan <alistair@devzero.co.uk>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Andreas Herrmann <herrmann.der.user@googlemail.com>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Roger Lucas <vt8231@hiddenengine.co.uk>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
@wfp5p @gregkh
wfp5p authored and gregkh committed Nov 28, 2012
1 parent a597724 commit 281dfd0
Show file tree
Hide file tree
Showing 44 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion drivers/hwmon/abituguru.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/abituguru3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/ad7314.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/ad7414.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/adcxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/ads7871.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/adt7411.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/coretemp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/da9052-hwmon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/dme1737.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/f71805f.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/fam15h_power.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/gpio-fan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/hih6130.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/i5k_amb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions drivers/hwmon/it87.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/jz4740-hwmon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/k10temp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/k8temp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/lm70.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/lm78.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/max1111.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/max197.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/mc13783-adc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/ntc_thermistor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/hwmon/pc87360.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/pc87427.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/s3c-hwmon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/sht15.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/sht21.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/hwmon/sis5595.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/smsc47b397.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/tmp102.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/twl4030-madc-hwmon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/ultra45_env.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/via-cputemp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/hwmon/via686a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/vt1211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/hwmon/vt8231.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 281dfd0

Please sign in to comment.