diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:22:48 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:14 -0500 |
commit | 3f6db0f38f2a170b4d9d5a7e3c329ab7701cd0cb (patch) | |
tree | 0380d242ba68f17f18781383a9c2732b8d4d5a33 /drivers/net/ethernet/3com/3c59x.c | |
parent | 58b10698d2d60b0b0c3bddd72038af14e62f92bc (diff) |
3c59x: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.
Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/3com/3c59x.c')
-rw-r--r-- | drivers/net/ethernet/3com/3c59x.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index e463d103682..658e224b361 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c | |||
@@ -102,7 +102,7 @@ static int vortex_debug = 1; | |||
102 | #include <linux/delay.h> | 102 | #include <linux/delay.h> |
103 | 103 | ||
104 | 104 | ||
105 | static const char version[] __devinitconst = | 105 | static const char version[] = |
106 | DRV_NAME ": Donald Becker and others.\n"; | 106 | DRV_NAME ": Donald Becker and others.\n"; |
107 | 107 | ||
108 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 108 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
@@ -277,7 +277,7 @@ static struct vortex_chip_info { | |||
277 | int flags; | 277 | int flags; |
278 | int drv_flags; | 278 | int drv_flags; |
279 | int io_size; | 279 | int io_size; |
280 | } vortex_info_tbl[] __devinitdata = { | 280 | } vortex_info_tbl[] = { |
281 | {"3c590 Vortex 10Mbps", | 281 | {"3c590 Vortex 10Mbps", |
282 | PCI_USES_MASTER, IS_VORTEX, 32, }, | 282 | PCI_USES_MASTER, IS_VORTEX, 32, }, |
283 | {"3c592 EISA 10Mbps Demon/Vortex", /* AKPM: from Don's 3c59x_cb.c 0.49H */ | 283 | {"3c592 EISA 10Mbps Demon/Vortex", /* AKPM: from Don's 3c59x_cb.c 0.49H */ |
@@ -931,7 +931,7 @@ static int __init vortex_eisa_probe(struct device *device) | |||
931 | return 0; | 931 | return 0; |
932 | } | 932 | } |
933 | 933 | ||
934 | static int __devexit vortex_eisa_remove(struct device *device) | 934 | static int vortex_eisa_remove(struct device *device) |
935 | { | 935 | { |
936 | struct eisa_device *edev; | 936 | struct eisa_device *edev; |
937 | struct net_device *dev; | 937 | struct net_device *dev; |
@@ -962,7 +962,7 @@ static struct eisa_driver vortex_eisa_driver = { | |||
962 | .driver = { | 962 | .driver = { |
963 | .name = "3c59x", | 963 | .name = "3c59x", |
964 | .probe = vortex_eisa_probe, | 964 | .probe = vortex_eisa_probe, |
965 | .remove = __devexit_p(vortex_eisa_remove) | 965 | .remove = vortex_eisa_remove |
966 | } | 966 | } |
967 | }; | 967 | }; |
968 | 968 | ||
@@ -1000,7 +1000,7 @@ static int __init vortex_eisa_init(void) | |||
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | /* returns count (>= 0), or negative on error */ | 1002 | /* returns count (>= 0), or negative on error */ |
1003 | static int __devinit vortex_init_one(struct pci_dev *pdev, | 1003 | static int vortex_init_one(struct pci_dev *pdev, |
1004 | const struct pci_device_id *ent) | 1004 | const struct pci_device_id *ent) |
1005 | { | 1005 | { |
1006 | int rc, unit, pci_bar; | 1006 | int rc, unit, pci_bar; |
@@ -1088,7 +1088,7 @@ static const struct net_device_ops vortex_netdev_ops = { | |||
1088 | * | 1088 | * |
1089 | * NOTE: pdev can be NULL, for the case of a Compaq device | 1089 | * NOTE: pdev can be NULL, for the case of a Compaq device |
1090 | */ | 1090 | */ |
1091 | static int __devinit vortex_probe1(struct device *gendev, | 1091 | static int vortex_probe1(struct device *gendev, |
1092 | void __iomem *ioaddr, int irq, | 1092 | void __iomem *ioaddr, int irq, |
1093 | int chip_idx, int card_idx) | 1093 | int chip_idx, int card_idx) |
1094 | { | 1094 | { |
@@ -3222,7 +3222,7 @@ static void acpi_set_WOL(struct net_device *dev) | |||
3222 | } | 3222 | } |
3223 | 3223 | ||
3224 | 3224 | ||
3225 | static void __devexit vortex_remove_one(struct pci_dev *pdev) | 3225 | static void vortex_remove_one(struct pci_dev *pdev) |
3226 | { | 3226 | { |
3227 | struct net_device *dev = pci_get_drvdata(pdev); | 3227 | struct net_device *dev = pci_get_drvdata(pdev); |
3228 | struct vortex_private *vp; | 3228 | struct vortex_private *vp; |
@@ -3265,7 +3265,7 @@ static void __devexit vortex_remove_one(struct pci_dev *pdev) | |||
3265 | static struct pci_driver vortex_driver = { | 3265 | static struct pci_driver vortex_driver = { |
3266 | .name = "3c59x", | 3266 | .name = "3c59x", |
3267 | .probe = vortex_init_one, | 3267 | .probe = vortex_init_one, |
3268 | .remove = __devexit_p(vortex_remove_one), | 3268 | .remove = vortex_remove_one, |
3269 | .id_table = vortex_pci_tbl, | 3269 | .id_table = vortex_pci_tbl, |
3270 | .driver.pm = VORTEX_PM_OPS, | 3270 | .driver.pm = VORTEX_PM_OPS, |
3271 | }; | 3271 | }; |