aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c509.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/3c509.c')
-rw-r--r--drivers/net/3c509.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index fbb371921991..393e4e711965 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -653,11 +653,11 @@ static int __init el3_mca_probe(struct device *device)
653 netdev_boot_setup_check(dev); 653 netdev_boot_setup_check(dev);
654 654
655 el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_MCA); 655 el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_MCA);
656 device->driver_data = dev; 656 dev_set_drvdata(device, dev);
657 err = el3_common_init(dev); 657 err = el3_common_init(dev);
658 658
659 if (err) { 659 if (err) {
660 device->driver_data = NULL; 660 dev_set_drvdata(device, NULL);
661 free_netdev(dev); 661 free_netdev(dev);
662 return -ENOMEM; 662 return -ENOMEM;
663 } 663 }
@@ -721,12 +721,12 @@ static int __init el3_eisa_probe (struct device *device)
721 721
722/* This remove works for all device types. 722/* This remove works for all device types.
723 * 723 *
724 * The net dev must be stored in the driver_data field */ 724 * The net dev must be stored in the driver data field */
725static int __devexit el3_device_remove (struct device *device) 725static int __devexit el3_device_remove (struct device *device)
726{ 726{
727 struct net_device *dev; 727 struct net_device *dev;
728 728
729 dev = device->driver_data; 729 dev = dev_get_drvdata(device);
730 730
731 el3_common_remove (dev); 731 el3_common_remove (dev);
732 return 0; 732 return 0;
@@ -1451,7 +1451,7 @@ el3_suspend(struct device *pdev, pm_message_t state)
1451 struct el3_private *lp; 1451 struct el3_private *lp;
1452 int ioaddr; 1452 int ioaddr;
1453 1453
1454 dev = pdev->driver_data; 1454 dev = dev_get_drvdata(pdev);
1455 lp = netdev_priv(dev); 1455 lp = netdev_priv(dev);
1456 ioaddr = dev->base_addr; 1456 ioaddr = dev->base_addr;
1457 1457
@@ -1475,7 +1475,7 @@ el3_resume(struct device *pdev)
1475 struct el3_private *lp; 1475 struct el3_private *lp;
1476 int ioaddr; 1476 int ioaddr;
1477 1477
1478 dev = pdev->driver_data; 1478 dev = dev_get_drvdata(pdev);
1479 lp = netdev_priv(dev); 1479 lp = netdev_priv(dev);
1480 ioaddr = dev->base_addr; 1480 ioaddr = dev->base_addr;
1481 1481