aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:24:37 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 14:49:40 -0500
commita5977246cfa44f70d7230f530918b7b7a06ad2eb (patch)
tree18ebd8f9d4b54b6f9ce3908e63e25aab334be199
parent6c931ae1c09a9618852c9619dac71f1f77776e3b (diff)
hwmon: remove use of __devinitdata
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>
-rw-r--r--drivers/hwmon/gpio-fan.c2
-rw-r--r--drivers/hwmon/i5k_amb.c4
-rw-r--r--drivers/hwmon/sis5595.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index e52856bdc7b6..0f46cca6179a 100644
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -499,7 +499,7 @@ static int gpio_fan_get_of_pdata(struct device *dev,
499 return 0; 499 return 0;
500} 500}
501 501
502static struct of_device_id of_gpio_fan_match[] __devinitdata = { 502static struct of_device_id of_gpio_fan_match[] = {
503 { .compatible = "gpio-fan", }, 503 { .compatible = "gpio-fan", },
504 {}, 504 {},
505}; 505};
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c
index 0d0faf056ae3..f3bc723c930c 100644
--- a/drivers/hwmon/i5k_amb.c
+++ b/drivers/hwmon/i5k_amb.c
@@ -488,14 +488,14 @@ out:
488static struct { 488static struct {
489 unsigned long err; 489 unsigned long err;
490 unsigned long fbd0; 490 unsigned long fbd0;
491} chipset_ids[] __devinitdata = { 491} chipset_ids[] = {
492 { PCI_DEVICE_ID_INTEL_5000_ERR, PCI_DEVICE_ID_INTEL_5000_FBD0 }, 492 { PCI_DEVICE_ID_INTEL_5000_ERR, PCI_DEVICE_ID_INTEL_5000_FBD0 },
493 { PCI_DEVICE_ID_INTEL_5400_ERR, PCI_DEVICE_ID_INTEL_5400_FBD0 }, 493 { PCI_DEVICE_ID_INTEL_5400_ERR, PCI_DEVICE_ID_INTEL_5400_FBD0 },
494 { 0, 0 } 494 { 0, 0 }
495}; 495};
496 496
497#ifdef MODULE 497#ifdef MODULE
498static struct pci_device_id i5k_amb_ids[] __devinitdata = { 498static struct pci_device_id i5k_amb_ids[] = {
499 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) }, 499 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
500 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) }, 500 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
501 { 0, } 501 { 0, }
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 5adc8299b264..e84836bcb6c8 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -758,7 +758,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis5595_pci_ids) = {
758 758
759MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 759MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
760 760
761static int blacklist[] __devinitdata = { 761static int blacklist[] = {
762 PCI_DEVICE_ID_SI_540, 762 PCI_DEVICE_ID_SI_540,
763 PCI_DEVICE_ID_SI_550, 763 PCI_DEVICE_ID_SI_550,
764 PCI_DEVICE_ID_SI_630, 764 PCI_DEVICE_ID_SI_630,