diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:23:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:03 -0500 |
commit | 9b3c6e85c2cfa731cf67d5a8c49f7d8c60ec0b04 (patch) | |
tree | 1aa850545cc894e835199b877edf93c6a340e58d /drivers/edac/i5000_edac.c | |
parent | 312facaf924edd4db6b81e3a1518adf56c9cd8bd (diff) |
Drivers: edac: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Mark Gross <mark.gross@intel.com>
Cc: Jason Uhlenkott <juhlenko@akamai.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Tim Small <tim@buttersideup.com>
Cc: Ranganathan Desikan <ravi@jetztechnologies.com>
Cc: "Arvind R." <arvino55@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Daney <david.daney@cavium.com>
Cc: Egor Martovetsky <egor@pasemi.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/edac/i5000_edac.c')
-rw-r--r-- | drivers/edac/i5000_edac.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index 6a49dd00b81b..63b2194e8c20 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c | |||
@@ -1489,8 +1489,7 @@ fail0: | |||
1489 | * negative on error | 1489 | * negative on error |
1490 | * count (>= 0) | 1490 | * count (>= 0) |
1491 | */ | 1491 | */ |
1492 | static int __devinit i5000_init_one(struct pci_dev *pdev, | 1492 | static int i5000_init_one(struct pci_dev *pdev, const struct pci_device_id *id) |
1493 | const struct pci_device_id *id) | ||
1494 | { | 1493 | { |
1495 | int rc; | 1494 | int rc; |
1496 | 1495 | ||
@@ -1509,7 +1508,7 @@ static int __devinit i5000_init_one(struct pci_dev *pdev, | |||
1509 | * i5000_remove_one destructor for one instance of device | 1508 | * i5000_remove_one destructor for one instance of device |
1510 | * | 1509 | * |
1511 | */ | 1510 | */ |
1512 | static void __devexit i5000_remove_one(struct pci_dev *pdev) | 1511 | static void i5000_remove_one(struct pci_dev *pdev) |
1513 | { | 1512 | { |
1514 | struct mem_ctl_info *mci; | 1513 | struct mem_ctl_info *mci; |
1515 | 1514 | ||
@@ -1547,7 +1546,7 @@ MODULE_DEVICE_TABLE(pci, i5000_pci_tbl); | |||
1547 | static struct pci_driver i5000_driver = { | 1546 | static struct pci_driver i5000_driver = { |
1548 | .name = KBUILD_BASENAME, | 1547 | .name = KBUILD_BASENAME, |
1549 | .probe = i5000_init_one, | 1548 | .probe = i5000_init_one, |
1550 | .remove = __devexit_p(i5000_remove_one), | 1549 | .remove = i5000_remove_one, |
1551 | .id_table = i5000_pci_tbl, | 1550 | .id_table = i5000_pci_tbl, |
1552 | }; | 1551 | }; |
1553 | 1552 | ||