From 9e5e9b7a92e4e2e4ac1f0d6aa181639637660e45 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:21:20 -0500 Subject: hwmon: remove use of __devexit_p CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton Cc: Hans de Goede Cc: Jean Delvare Cc: Alistair John Strachan Cc: Fenghua Yu Cc: Juerg Haefliger Cc: Andreas Herrmann Cc: Clemens Ladisch Cc: Rudolf Marek Cc: Jim Cromie Cc: "Mark M. Hoffman" Cc: Roger Lucas Acked-by: Guenter Roeck Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/sis5595.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/hwmon/sis5595.c') diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index 8275f0e14eb7..fb6b6ed6accd 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c @@ -217,7 +217,7 @@ static struct platform_driver sis5595_driver = { .name = "sis5595", }, .probe = sis5595_probe, - .remove = __devexit_p(sis5595_remove), + .remove = sis5595_remove, }; /* 4 Voltages */ -- cgit v1.2.1 From 6c931ae1c09a9618852c9619dac71f1f77776e3b Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:22:35 -0500 Subject: hwmon: remove use of __devinit CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton Cc: Hans de Goede Cc: Jean Delvare Cc: Alistair John Strachan Cc: Fenghua Yu Cc: Juerg Haefliger Cc: Andreas Herrmann Cc: Clemens Ladisch Cc: Rudolf Marek Cc: Jim Cromie Cc: "Mark M. Hoffman" Cc: Roger Lucas Acked-by: Guenter Roeck Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/sis5595.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/hwmon/sis5595.c') diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index fb6b6ed6accd..5adc8299b264 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c @@ -583,7 +583,7 @@ static const struct attribute_group sis5595_group_temp1 = { }; /* This is called when the module is loaded */ -static int __devinit sis5595_probe(struct platform_device *pdev) +static int sis5595_probe(struct platform_device *pdev) { int err = 0; int i; @@ -693,7 +693,7 @@ static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value) } /* Called when we have found a new SIS5595. */ -static void __devinit sis5595_init_device(struct sis5595_data *data) +static void sis5595_init_device(struct sis5595_data *data) { u8 config = sis5595_read_value(data, SIS5595_REG_CONFIG); if (!(config & 0x01)) @@ -774,7 +774,7 @@ static int blacklist[] __devinitdata = { PCI_DEVICE_ID_SI_5598, 0 }; -static int __devinit sis5595_device_add(unsigned short address) +static int sis5595_device_add(unsigned short address) { struct resource res = { .start = address, @@ -815,7 +815,7 @@ exit: return err; } -static int __devinit sis5595_pci_probe(struct pci_dev *dev, +static int sis5595_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) { u16 address; -- cgit v1.2.1 From a5977246cfa44f70d7230f530918b7b7a06ad2eb Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:24:37 -0500 Subject: hwmon: remove use of __devinitdata CONFIG_HOTPLUG is going away as an option so __devinitdata is no longer needed. Signed-off-by: Bill Pemberton Cc: Jean Delvare Acked-by: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/sis5595.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/hwmon/sis5595.c') 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) = { 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, -- cgit v1.2.1 From 281dfd0b6ed5403f5b9b1669f2a37a4f8cfc11c1 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:25:51 -0500 Subject: hwmon: remove use of __devexit CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton Cc: Hans de Goede Cc: Jean Delvare Cc: Alistair John Strachan Cc: Fenghua Yu Cc: Juerg Haefliger Cc: Andreas Herrmann Cc: Clemens Ladisch Cc: Rudolf Marek Cc: Jim Cromie Cc: "Mark M. Hoffman" Cc: Roger Lucas Acked-by: Guenter Roeck Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/sis5595.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/hwmon/sis5595.c') diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index e84836bcb6c8..06ce3c911db9 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c @@ -204,7 +204,7 @@ struct sis5595_data { static struct pci_dev *s_bridge; /* pointer to the (only) sis5595 */ 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 void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value); @@ -659,7 +659,7 @@ exit_remove_files: 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); -- cgit v1.2.1