Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5977246 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

hwmon: remove use of __devinitdata 



CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Jean Delvare <khali@linux-fr.org>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c931ae1

drivers/hwmon/gpio-fan.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -499,7 +499,7 @@ static int gpio_fan_get_of_pdata(struct device *dev, 
	return 0;

	return 0;

}

}





static struct of_device_id of_gpio_fan_match[] __devinitdata = {

static struct of_device_id of_gpio_fan_match[] = {

	{ .compatible = "gpio-fan", },

	{ .compatible = "gpio-fan", },

	{},

	{},

};

};

drivers/hwmon/i5k_amb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -488,14 +488,14 @@ static int i5k_channel_probe(u16 *amb_present, unsigned long dev_id) 
static struct {

static struct {

	unsigned long err;

	unsigned long err;

	unsigned long fbd0;

	unsigned long fbd0;

} chipset_ids[] __devinitdata  = {

} chipset_ids[]  = {

	{ PCI_DEVICE_ID_INTEL_5000_ERR, PCI_DEVICE_ID_INTEL_5000_FBD0 },

	{ PCI_DEVICE_ID_INTEL_5000_ERR, PCI_DEVICE_ID_INTEL_5000_FBD0 },

	{ PCI_DEVICE_ID_INTEL_5400_ERR, PCI_DEVICE_ID_INTEL_5400_FBD0 },

	{ PCI_DEVICE_ID_INTEL_5400_ERR, PCI_DEVICE_ID_INTEL_5400_FBD0 },

	{ 0, 0 }

	{ 0, 0 }

};

};





#ifdef MODULE

#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_5000_ERR) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },

	{ 0, }

	{ 0, }

drivers/hwmon/sis5595.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -758,7 +758,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis5595_pci_ids) = { 




MODULE_DEVICE_TABLE(pci, 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_540,

	PCI_DEVICE_ID_SI_550,

	PCI_DEVICE_ID_SI_550,

	PCI_DEVICE_ID_SI_630,

	PCI_DEVICE_ID_SI_630,