dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

hwmon: remove use of __devexit 

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>
This commit is contained in:
Bill Pemberton 2012-11-19 13:25:51 -05:00 committed by Greg Kroah-Hartman
parent a5977246cf
commit 281dfd0b6e
44 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwmon/abituguru.c
View File

@ -1434,7 +1434,7 @@ abituguru_probe_error:
return res; return res;
} }
static int __devexit abituguru_remove(struct platform_device *pdev) static int abituguru_remove(struct platform_device *pdev)
{ {
int i; int i;
struct abituguru_data *data = platform_get_drvdata(pdev); struct abituguru_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/abituguru3.c
View File

@ -1072,7 +1072,7 @@ abituguru3_probe_error:
return res; return res;
} }
static int __devexit abituguru3_remove(struct platform_device *pdev) static int abituguru3_remove(struct platform_device *pdev)
{ {
int i; int i;
struct abituguru3_data *data = platform_get_drvdata(pdev); struct abituguru3_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/ad7314.c
View File

@ -135,7 +135,7 @@ error_remove_group:
return ret; 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); struct ad7314_data *chip = dev_get_drvdata(&spi_dev->dev);

2
drivers/hwmon/ad7414.c
View File

@ -226,7 +226,7 @@ exit_remove:
return err; 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); struct ad7414_data *data = i2c_get_clientdata(client);

2
drivers/hwmon/adcxx.c
View File

@ -208,7 +208,7 @@ out_err:
return status; 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); struct adcxx *adc = spi_get_drvdata(spi);
int i; int i;

2
drivers/hwmon/ads7871.c
View File

@ -225,7 +225,7 @@ error_remove:
return err; 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); struct ads7871_data *pdata = spi_get_drvdata(spi);

2
drivers/hwmon/adt7411.c
View File

@ -317,7 +317,7 @@ static int adt7411_probe(struct i2c_client *client,
return ret; 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); struct adt7411_data *data = i2c_get_clientdata(client);

2
drivers/hwmon/coretemp.c
View File

@ -586,7 +586,7 @@ exit_free:
return err; 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); struct platform_data *pdata = platform_get_drvdata(pdev);
int i; int i;

2
drivers/hwmon/da9052-hwmon.c
View File

@ -316,7 +316,7 @@ err_mem:
return ret; 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); struct da9052_hwmon *hwmon = platform_get_drvdata(pdev);

2
drivers/hwmon/dme1737.c
View File

@ -2718,7 +2718,7 @@ exit_remove_files:
return err; 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); struct dme1737_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/f71805f.c
View File

@ -1490,7 +1490,7 @@ exit_remove_files:
return err; 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); struct f71805f_data *data = platform_get_drvdata(pdev);
int i; int i;

2
drivers/hwmon/fam15h_power.c
View File

@ -235,7 +235,7 @@ exit_remove_group:
return err; 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 device *dev;
struct fam15h_power_data *data; struct fam15h_power_data *data;

2
drivers/hwmon/gpio-fan.c
View File

@ -581,7 +581,7 @@ err_free_alarm:
return err; 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); struct gpio_fan_data *fan_data = platform_get_drvdata(pdev);

2
drivers/hwmon/hih6130.c
View File

@ -263,7 +263,7 @@ fail_remove_sysfs:
* hih6130_remove() - remove device * hih6130_remove() - remove device
* @client: I2C client 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); struct hih6130 *hih6130 = i2c_get_clientdata(client);

2
drivers/hwmon/i5k_amb.c
View File

@ -564,7 +564,7 @@ err:
return res; return res;
} }
static int __devexit i5k_amb_remove(struct platform_device *pdev) static int i5k_amb_remove(struct platform_device *pdev)
{ {
int i; int i;
struct i5k_amb_data *data = platform_get_drvdata(pdev); struct i5k_amb_data *data = platform_get_drvdata(pdev);

4
drivers/hwmon/it87.c
View File

@ -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 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 int it87_read_value(struct it87_data *data, u8 reg);
static void it87_write_value(struct it87_data *data, u8 reg, u8 value); static void it87_write_value(struct it87_data *data, u8 reg, u8 value);
@ -2158,7 +2158,7 @@ error:
return err; 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); struct it87_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/jz4740-hwmon.c
View File

@ -172,7 +172,7 @@ err_remove_file:
return ret; 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); struct jz4740_hwmon *hwmon = platform_get_drvdata(pdev);

2
drivers/hwmon/k10temp.c
View File

@ -192,7 +192,7 @@ exit:
return err; 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)); hwmon_device_unregister(pci_get_drvdata(pdev));
device_remove_file(&pdev->dev, &dev_attr_name); device_remove_file(&pdev->dev, &dev_attr_name);

2
drivers/hwmon/k8temp.c
View File

@ -304,7 +304,7 @@ exit_remove:
return err; 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); struct k8temp_data *data = pci_get_drvdata(pdev);

2
drivers/hwmon/lm70.c
View File

@ -178,7 +178,7 @@ out_dev_create_temp_file_failed:
return status; 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); struct lm70 *p_lm70 = spi_get_drvdata(spi);

2
drivers/hwmon/lm78.c
View File

@ -886,7 +886,7 @@ static int lm78_isa_probe(struct platform_device *pdev)
return err; 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); struct lm78_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/max1111.c
View File

@ -256,7 +256,7 @@ err_remove:
return err; 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); struct max1111_data *data = spi_get_drvdata(spi);

2
drivers/hwmon/max197.c
View File

@ -316,7 +316,7 @@ error:
return ret; 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); struct max197_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/mc13783-adc.c
View File

@ -233,7 +233,7 @@ out_err_create_16chans:
return ret; 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); struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
kernel_ulong_t driver_data = platform_get_device_id(pdev)->driver_data; kernel_ulong_t driver_data = platform_get_device_id(pdev)->driver_data;

2
drivers/hwmon/ntc_thermistor.c
View File

@ -393,7 +393,7 @@ err_after_sysfs:
return ret; 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); struct ntc_data *data = platform_get_drvdata(pdev);

4
drivers/hwmon/pc87360.c
View File

@ -228,7 +228,7 @@ struct pc87360_data {
*/ */
static int pc87360_probe(struct platform_device *pdev); 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, static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
u8 reg); u8 reg);
@ -1375,7 +1375,7 @@ error:
return err; 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); struct pc87360_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/pc87427.c
View File

@ -1141,7 +1141,7 @@ exit_remove_files:
return err; 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); struct pc87427_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/s3c-hwmon.c
View File

@ -364,7 +364,7 @@ static int s3c_hwmon_probe(struct platform_device *dev)
return ret; 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); struct s3c_hwmon *hwmon = platform_get_drvdata(dev);
int i; int i;

2
drivers/hwmon/sht15.c
View File

@ -1002,7 +1002,7 @@ err_release_reg:
return ret; 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); struct sht15_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/sht21.c
View File

@ -233,7 +233,7 @@ fail_remove_sysfs:
* sht21_remove() - remove device * sht21_remove() - remove device
* @client: I2C client 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); struct sht21 *sht21 = i2c_get_clientdata(client);

4
drivers/hwmon/sis5595.c
View File

@ -204,7 +204,7 @@ struct sis5595_data {
static struct pci_dev *s_bridge; /* pointer to the (only) sis5595 */ static struct pci_dev *s_bridge; /* pointer to the (only) sis5595 */
static int sis5595_probe(struct platform_device *pdev); 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 int sis5595_read_value(struct sis5595_data *data, u8 reg);
static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value); static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value);
@ -659,7 +659,7 @@ exit_remove_files:
return err; 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); struct sis5595_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/smsc47b397.c
View File

@ -228,7 +228,7 @@ static const struct attribute_group smsc47b397_group = {
.attrs = smsc47b397_attributes, .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); struct smsc47b397_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/tmp102.c
View File

@ -216,7 +216,7 @@ fail_restore_config:
return status; 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); struct tmp102 *tmp102 = i2c_get_clientdata(client);

2
drivers/hwmon/twl4030-madc-hwmon.c
View File

@ -120,7 +120,7 @@ err_sysfs:
return ret; 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); hwmon_device_unregister(&pdev->dev);
sysfs_remove_group(&pdev->dev.kobj, &twl4030_madc_group); sysfs_remove_group(&pdev->dev.kobj, &twl4030_madc_group);

2
drivers/hwmon/ultra45_env.c
View File

@ -291,7 +291,7 @@ out_free:
goto out; 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); struct env *p = platform_get_drvdata(op);

2
drivers/hwmon/via-cputemp.c
View File

@ -192,7 +192,7 @@ exit_remove:
return err; 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); struct via_cputemp_data *data = platform_get_drvdata(pdev);

4
drivers/hwmon/via686a.c
View File

@ -339,7 +339,7 @@ struct via686a_data {
static struct pci_dev *s_bridge; /* pointer to the (only) via686a */ static struct pci_dev *s_bridge; /* pointer to the (only) via686a */
static int via686a_probe(struct platform_device *pdev); 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) static inline int via686a_read_value(struct via686a_data *data, u8 reg)
{ {
@ -728,7 +728,7 @@ exit_remove_files:
return err; 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); struct via686a_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/vt1211.c
View File

@ -1217,7 +1217,7 @@ EXIT_DEV_REMOVE_SILENT:
return err; 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); struct vt1211_data *data = platform_get_drvdata(pdev);

4
drivers/hwmon/vt8231.c
View File

@ -176,7 +176,7 @@ struct vt8231_data {
static struct pci_dev *s_bridge; static struct pci_dev *s_bridge;
static int vt8231_probe(struct platform_device *pdev); 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 struct vt8231_data *vt8231_update_device(struct device *dev);
static void vt8231_init_device(struct vt8231_data *data); static void vt8231_init_device(struct vt8231_data *data);
@ -851,7 +851,7 @@ exit_remove_files:
return err; 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); struct vt8231_data *data = platform_get_drvdata(pdev);
int i; int i;

2
drivers/hwmon/w83627ehf.c
View File

@ -2596,7 +2596,7 @@ exit:
return err; 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); struct w83627ehf_data *data = platform_get_drvdata(pdev);

4
drivers/hwmon/w83627hf.c
View File

@ -393,7 +393,7 @@ struct w83627hf_data {
static int w83627hf_probe(struct platform_device *pdev); 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_read_value(struct w83627hf_data *data, u16 reg);
static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value); 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; 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); struct w83627hf_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/w83781d.c
View File

@ -1824,7 +1824,7 @@ w83781d_isa_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit static int
w83781d_isa_remove(struct platform_device *pdev) w83781d_isa_remove(struct platform_device *pdev)
{ {
struct w83781d_data *data = platform_get_drvdata(pdev); struct w83781d_data *data = platform_get_drvdata(pdev);

2
drivers/hwmon/wm831x-hwmon.c
View File

@ -189,7 +189,7 @@ err_sysfs:
return ret; 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); struct wm831x_hwmon *hwmon = platform_get_drvdata(pdev);

2
drivers/hwmon/wm8350-hwmon.c
View File

@ -114,7 +114,7 @@ err:
return ret; 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); struct wm8350 *wm8350 = platform_get_drvdata(pdev);