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/sis5595.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/sis5595.c')
-rw-r--r-- | drivers/hwmon/sis5595.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 = { | |||
583 | }; | 583 | }; |
584 | 584 | ||
585 | /* This is called when the module is loaded */ | 585 | /* This is called when the module is loaded */ |
586 | static int __devinit sis5595_probe(struct platform_device *pdev) | 586 | static int sis5595_probe(struct platform_device *pdev) |
587 | { | 587 | { |
588 | int err = 0; | 588 | int err = 0; |
589 | int i; | 589 | int i; |
@@ -693,7 +693,7 @@ static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value) | |||
693 | } | 693 | } |
694 | 694 | ||
695 | /* Called when we have found a new SIS5595. */ | 695 | /* Called when we have found a new SIS5595. */ |
696 | static void __devinit sis5595_init_device(struct sis5595_data *data) | 696 | static void sis5595_init_device(struct sis5595_data *data) |
697 | { | 697 | { |
698 | u8 config = sis5595_read_value(data, SIS5595_REG_CONFIG); | 698 | u8 config = sis5595_read_value(data, SIS5595_REG_CONFIG); |
699 | if (!(config & 0x01)) | 699 | if (!(config & 0x01)) |
@@ -774,7 +774,7 @@ static int blacklist[] __devinitdata = { | |||
774 | PCI_DEVICE_ID_SI_5598, | 774 | PCI_DEVICE_ID_SI_5598, |
775 | 0 }; | 775 | 0 }; |
776 | 776 | ||
777 | static int __devinit sis5595_device_add(unsigned short address) | 777 | static int sis5595_device_add(unsigned short address) |
778 | { | 778 | { |
779 | struct resource res = { | 779 | struct resource res = { |
780 | .start = address, | 780 | .start = address, |
@@ -815,7 +815,7 @@ exit: | |||
815 | return err; | 815 | return err; |
816 | } | 816 | } |
817 | 817 | ||
818 | static int __devinit sis5595_pci_probe(struct pci_dev *dev, | 818 | static int sis5595_pci_probe(struct pci_dev *dev, |
819 | const struct pci_device_id *id) | 819 | const struct pci_device_id *id) |
820 | { | 820 | { |
821 | u16 address; | 821 | u16 address; |