diff options
| author | Greg Kroah-Hartman | 2009-07-24 20:00:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-15 21:01:45 +0200 |
| commit | 621d7fb7597e8cc2e24e6b0ca67118b452675d90 (patch) | |
| tree | dc4eee53704a578ccdf5abe5da313c3427e82d66 /drivers/staging/hv/netvsc_drv.c | |
| parent | Staging: hv: add the Hyper-V virtual network driver to the build (diff) | |
| download | kernel-qcow2-linux-621d7fb7597e8cc2e24e6b0ca67118b452675d90.tar.gz kernel-qcow2-linux-621d7fb7597e8cc2e24e6b0ca67118b452675d90.tar.xz kernel-qcow2-linux-621d7fb7597e8cc2e24e6b0ca67118b452675d90.zip | |
Staging: hv: netvsc: fix up driver_data usage
driver_data is gone now from struct device, so use the proper functions
to access it instead.
Thanks to Bill Pemberton for pointing out this build error.
Cc: Bill Pemberton <wfp5p@viridian.itc.Virginia.EDU>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/netvsc_drv.c')
| -rw-r--r-- | drivers/staging/hv/netvsc_drv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 71931f553193..cd3f3b53f59b 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -209,14 +209,14 @@ static int netvsc_probe(struct device *device) net_device_ctx = netdev_priv(net); net_device_ctx->device_ctx = device_ctx; - device->driver_data = net; + dev_set_drvdata(device, net); // Notify the netvsc driver of the new device ret = net_drv_obj->Base.OnDeviceAdd(device_obj, (void*)&device_info); if (ret != 0) { free_netdev(net); - device->driver_data = NULL; + dev_set_drvdata(device, NULL); DPRINT_ERR(NETVSC_DRV, "unable to add netvsc device (ret %d)", ret); return ret; @@ -262,7 +262,7 @@ static int netvsc_remove(struct device *device) NETVSC_DRIVER_OBJECT *net_drv_obj = &net_drv_ctx->drv_obj; struct device_context *device_ctx = device_to_device_context(device); - struct net_device *net = (struct net_device *)device_ctx->device.driver_data; + struct net_device *net = dev_get_drvdata(&device_ctx->device); DEVICE_OBJECT *device_obj = &device_ctx->device_obj; DPRINT_ENTER(NETVSC_DRV); @@ -536,7 +536,7 @@ Desc: Link up/down notification static void netvsc_linkstatus_callback(DEVICE_OBJECT *device_obj, unsigned int status) { struct device_context* device_ctx = to_device_context(device_obj); - struct net_device* net = (struct net_device *)device_ctx->device.driver_data; + struct net_device* net = dev_get_drvdata(&device_ctx->device); DPRINT_ENTER(NETVSC_DRV); @@ -571,7 +571,7 @@ static int netvsc_recv_callback(DEVICE_OBJECT *device_obj, NETVSC_PACKET* packet { int ret=0; struct device_context *device_ctx = to_device_context(device_obj); - struct net_device *net = (struct net_device *)device_ctx->device.driver_data; + struct net_device *net = dev_get_drvdata(&device_ctx->device); struct net_device_context *net_device_ctx; struct sk_buff *skb; |