aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ne3210.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-04-30 08:19:31 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-01 18:21:55 -0400
commit1aec5bdfed91b50aedbcad43393bcb05033c7ef3 (patch)
tree258db4a51298bc18f859170e8d611a8e3b406b0f /drivers/net/ne3210.c
parentaba7453037c3a90714caae77a622dceaf1173786 (diff)
net: remove driver_data direct access of struct device
In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions. Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ne3210.c')
-rw-r--r--drivers/net/ne3210.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index 6a843f7350ab..a00bbfb9aed0 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -104,7 +104,7 @@ static int __init ne3210_eisa_probe (struct device *device)
104 } 104 }
105 105
106 SET_NETDEV_DEV(dev, device); 106 SET_NETDEV_DEV(dev, device);
107 device->driver_data = dev; 107 dev_set_drvdata(device, dev);
108 ioaddr = edev->base_addr; 108 ioaddr = edev->base_addr;
109 109
110 if (!request_region(ioaddr, NE3210_IO_EXTENT, DRV_NAME)) { 110 if (!request_region(ioaddr, NE3210_IO_EXTENT, DRV_NAME)) {
@@ -225,7 +225,7 @@ static int __init ne3210_eisa_probe (struct device *device)
225 225
226static int __devexit ne3210_eisa_remove (struct device *device) 226static int __devexit ne3210_eisa_remove (struct device *device)
227{ 227{
228 struct net_device *dev = device->driver_data; 228 struct net_device *dev = dev_get_drvdata(device);
229 unsigned long ioaddr = to_eisa_device (device)->base_addr; 229 unsigned long ioaddr = to_eisa_device (device)->base_addr;
230 230
231 unregister_netdev (dev); 231 unregister_netdev (dev);