Skip to content

Commit

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

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
wfp5p authored and gregkh committed Nov 28, 2012
1 parent 6c931ae commit a597724
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/hwmon/gpio-fan.c
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ static int gpio_fan_get_of_pdata(struct device *dev,
return 0;
}

static struct of_device_id of_gpio_fan_match[] __devinitdata = {
static struct of_device_id of_gpio_fan_match[] = {
{ .compatible = "gpio-fan", },
{},
};
Expand Down
4 changes: 2 additions & 2 deletions drivers/hwmon/i5k_amb.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,14 +488,14 @@ static int i5k_channel_probe(u16 *amb_present, unsigned long dev_id)
static struct {
unsigned long err;
unsigned long fbd0;
} chipset_ids[] __devinitdata = {
} chipset_ids[] = {
{ PCI_DEVICE_ID_INTEL_5000_ERR, PCI_DEVICE_ID_INTEL_5000_FBD0 },
{ PCI_DEVICE_ID_INTEL_5400_ERR, PCI_DEVICE_ID_INTEL_5400_FBD0 },
{ 0, 0 }
};

#ifdef MODULE
static struct pci_device_id i5k_amb_ids[] __devinitdata = {
static struct pci_device_id i5k_amb_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
{ 0, }
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/sis5595.c
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis5595_pci_ids) = {

MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);

static int blacklist[] __devinitdata = {
static int blacklist[] = {
PCI_DEVICE_ID_SI_540,
PCI_DEVICE_ID_SI_550,
PCI_DEVICE_ID_SI_630,
Expand Down

0 comments on commit a597724

Please sign in to comment.