aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/toshiba
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:24:05 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:16:55 -0500
commit671a1435b4e04aa7fadca6e19d39cbc2d0617319 (patch)
tree4cf7994bd6cad939bf47ca7f124aacca096e700b /drivers/net/ethernet/toshiba
parent14d4171de914859ea34cc820d1548c5063b8aaf4 (diff)
net/spider_net: 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: Ishizaki Kou <kou.ishizaki@toshiba.co.jp> Cc: Jens Osterkamp <jens@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/toshiba')
-rw-r--r--drivers/net/ethernet/toshiba/spider_net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c
index c1ebfe9efcb3..f1b91fd7e41c 100644
--- a/drivers/net/ethernet/toshiba/spider_net.c
+++ b/drivers/net/ethernet/toshiba/spider_net.c
@@ -2492,7 +2492,7 @@ out_disable_dev:
2492 * spider_net_probe initializes pdev and registers a net_device 2492 * spider_net_probe initializes pdev and registers a net_device
2493 * structure for it. After that, the device can be ifconfig'ed up 2493 * structure for it. After that, the device can be ifconfig'ed up
2494 **/ 2494 **/
2495static int __devinit 2495static int
2496spider_net_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 2496spider_net_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2497{ 2497{
2498 int err = -EIO; 2498 int err = -EIO;
@@ -2531,7 +2531,7 @@ out:
2531 * spider_net_remove is called to remove the device and unregisters the 2531 * spider_net_remove is called to remove the device and unregisters the
2532 * net_device 2532 * net_device
2533 **/ 2533 **/
2534static void __devexit 2534static void
2535spider_net_remove(struct pci_dev *pdev) 2535spider_net_remove(struct pci_dev *pdev)
2536{ 2536{
2537 struct net_device *netdev; 2537 struct net_device *netdev;
@@ -2559,7 +2559,7 @@ static struct pci_driver spider_net_driver = {
2559 .name = spider_net_driver_name, 2559 .name = spider_net_driver_name,
2560 .id_table = spider_net_pci_tbl, 2560 .id_table = spider_net_pci_tbl,
2561 .probe = spider_net_probe, 2561 .probe = spider_net_probe,
2562 .remove = __devexit_p(spider_net_remove) 2562 .remove = spider_net_remove
2563}; 2563};
2564 2564
2565/** 2565/**