diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:53 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:54 -0500 |
commit | af37557b1b222c64e005c105c81aa3888128bb5d (patch) | |
tree | ef41c30b19a4d696b20679dee0441f1d993a319e /drivers | |
parent | 331774760a65c27c673aa7735075124978e7994b (diff) |
jme: 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: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/jme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index 60ac46f4ac08..0519afa413d2 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c | |||
@@ -2965,7 +2965,7 @@ static const struct net_device_ops jme_netdev_ops = { | |||
2965 | #endif | 2965 | #endif |
2966 | }; | 2966 | }; |
2967 | 2967 | ||
2968 | static int __devinit | 2968 | static int |
2969 | jme_init_one(struct pci_dev *pdev, | 2969 | jme_init_one(struct pci_dev *pdev, |
2970 | const struct pci_device_id *ent) | 2970 | const struct pci_device_id *ent) |
2971 | { | 2971 | { |
@@ -3203,7 +3203,7 @@ err_out: | |||
3203 | return rc; | 3203 | return rc; |
3204 | } | 3204 | } |
3205 | 3205 | ||
3206 | static void __devexit | 3206 | static void |
3207 | jme_remove_one(struct pci_dev *pdev) | 3207 | jme_remove_one(struct pci_dev *pdev) |
3208 | { | 3208 | { |
3209 | struct net_device *netdev = pci_get_drvdata(pdev); | 3209 | struct net_device *netdev = pci_get_drvdata(pdev); |
@@ -3318,7 +3318,7 @@ static struct pci_driver jme_driver = { | |||
3318 | .name = DRV_NAME, | 3318 | .name = DRV_NAME, |
3319 | .id_table = jme_pci_tbl, | 3319 | .id_table = jme_pci_tbl, |
3320 | .probe = jme_init_one, | 3320 | .probe = jme_init_one, |
3321 | .remove = __devexit_p(jme_remove_one), | 3321 | .remove = jme_remove_one, |
3322 | .shutdown = jme_shutdown, | 3322 | .shutdown = jme_shutdown, |
3323 | .driver.pm = JME_PM_OPS, | 3323 | .driver.pm = JME_PM_OPS, |
3324 | }; | 3324 | }; |