diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 18:08:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:15 -0500 |
commit | 1e6d9abea73128cff1160624a8986570c48a095b (patch) | |
tree | 7fcc4286f545d509d6c1d0827a83616bb0bbad16 /drivers/infiniband/hw/nes | |
parent | 27796aa0dce01661fedb5f3fa6b11db13f02a77f (diff) |
Drivers: infinband: 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, __devinitdata,
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: Tom Tucker <tom@opengridcomputing.com>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Roland Dreier <roland@kernel.org>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: Hoang-Nam Nguyen <hnguyen@de.ibm.com>
Cc: Christoph Raisch <raisch@de.ibm.com>
Cc: Mike Marciniszyn <infinipath@intel.com>
Cc: Faisal Latif <faisal.latif@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband/hw/nes')
-rw-r--r-- | drivers/infiniband/hw/nes/nes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 748db2d3e465..5b152a366dff 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c | |||
@@ -444,7 +444,7 @@ static irqreturn_t nes_interrupt(int irq, void *dev_id) | |||
444 | /** | 444 | /** |
445 | * nes_probe - Device initialization | 445 | * nes_probe - Device initialization |
446 | */ | 446 | */ |
447 | static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) | 447 | static int nes_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) |
448 | { | 448 | { |
449 | struct net_device *netdev = NULL; | 449 | struct net_device *netdev = NULL; |
450 | struct nes_device *nesdev = NULL; | 450 | struct nes_device *nesdev = NULL; |
@@ -749,7 +749,7 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i | |||
749 | /** | 749 | /** |
750 | * nes_remove - unload from kernel | 750 | * nes_remove - unload from kernel |
751 | */ | 751 | */ |
752 | static void __devexit nes_remove(struct pci_dev *pcidev) | 752 | static void nes_remove(struct pci_dev *pcidev) |
753 | { | 753 | { |
754 | struct nes_device *nesdev = pci_get_drvdata(pcidev); | 754 | struct nes_device *nesdev = pci_get_drvdata(pcidev); |
755 | struct net_device *netdev; | 755 | struct net_device *netdev; |
@@ -810,7 +810,7 @@ static struct pci_driver nes_pci_driver = { | |||
810 | .name = DRV_NAME, | 810 | .name = DRV_NAME, |
811 | .id_table = nes_pci_table, | 811 | .id_table = nes_pci_table, |
812 | .probe = nes_probe, | 812 | .probe = nes_probe, |
813 | .remove = __devexit_p(nes_remove), | 813 | .remove = nes_remove, |
814 | }; | 814 | }; |
815 | 815 | ||
816 | static ssize_t nes_show_adapter(struct device_driver *ddp, char *buf) | 816 | static ssize_t nes_show_adapter(struct device_driver *ddp, char *buf) |