OSDN Git Service

hwmon: remove use of __devinitdata
authorBill Pemberton <wfp5p@virginia.edu>
Mon, 19 Nov 2012 18:24:37 +0000 (13:24 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Nov 2012 19:49:40 +0000 (11:49 -0800)
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>
drivers/hwmon/gpio-fan.c
drivers/hwmon/i5k_amb.c
drivers/hwmon/sis5595.c

index e52856b..0f46cca 100644 (file)
@@ -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", },
        {},
 };
index 0d0faf0..f3bc723 100644 (file)
@@ -488,14 +488,14 @@ out:
 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, }
index 5adc829..e84836b 100644 (file)
@@ -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,