diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:22:35 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 14:49:40 -0500 |
commit | 6c931ae1c09a9618852c9619dac71f1f77776e3b (patch) | |
tree | 2bf3ef58b8c122aa9714576f6b07b71948d9d1c7 /drivers/hwmon/i5k_amb.c | |
parent | 9e5e9b7a92e4e2e4ac1f0d6aa181639637660e45 (diff) |
hwmon: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Alistair John Strachan <alistair@devzero.co.uk>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Andreas Herrmann <herrmann.der.user@googlemail.com>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Roger Lucas <vt8231@hiddenengine.co.uk>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/i5k_amb.c')
-rw-r--r-- | drivers/hwmon/i5k_amb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index 3fa3cc8dd061..0d0faf056ae3 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c | |||
@@ -260,7 +260,7 @@ static ssize_t show_label(struct device *dev, | |||
260 | attr->index & DIMM_MASK); | 260 | attr->index & DIMM_MASK); |
261 | } | 261 | } |
262 | 262 | ||
263 | static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev) | 263 | static int i5k_amb_hwmon_init(struct platform_device *pdev) |
264 | { | 264 | { |
265 | int i, j, k, d = 0; | 265 | int i, j, k, d = 0; |
266 | u16 c; | 266 | u16 c; |
@@ -406,7 +406,7 @@ exit_remove: | |||
406 | return res; | 406 | return res; |
407 | } | 407 | } |
408 | 408 | ||
409 | static int __devinit i5k_amb_add(void) | 409 | static int i5k_amb_add(void) |
410 | { | 410 | { |
411 | int res = -ENODEV; | 411 | int res = -ENODEV; |
412 | 412 | ||
@@ -425,7 +425,7 @@ err: | |||
425 | return res; | 425 | return res; |
426 | } | 426 | } |
427 | 427 | ||
428 | static int __devinit i5k_find_amb_registers(struct i5k_amb_data *data, | 428 | static int i5k_find_amb_registers(struct i5k_amb_data *data, |
429 | unsigned long devid) | 429 | unsigned long devid) |
430 | { | 430 | { |
431 | struct pci_dev *pcidev; | 431 | struct pci_dev *pcidev; |
@@ -459,7 +459,7 @@ out: | |||
459 | return res; | 459 | return res; |
460 | } | 460 | } |
461 | 461 | ||
462 | static int __devinit i5k_channel_probe(u16 *amb_present, unsigned long dev_id) | 462 | static int i5k_channel_probe(u16 *amb_present, unsigned long dev_id) |
463 | { | 463 | { |
464 | struct pci_dev *pcidev; | 464 | struct pci_dev *pcidev; |
465 | u16 val16; | 465 | u16 val16; |
@@ -503,7 +503,7 @@ static struct pci_device_id i5k_amb_ids[] __devinitdata = { | |||
503 | MODULE_DEVICE_TABLE(pci, i5k_amb_ids); | 503 | MODULE_DEVICE_TABLE(pci, i5k_amb_ids); |
504 | #endif | 504 | #endif |
505 | 505 | ||
506 | static int __devinit i5k_amb_probe(struct platform_device *pdev) | 506 | static int i5k_amb_probe(struct platform_device *pdev) |
507 | { | 507 | { |
508 | struct i5k_amb_data *data; | 508 | struct i5k_amb_data *data; |
509 | struct resource *reso; | 509 | struct resource *reso; |