lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: hv: netvsc: fix up driver_data usage

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2009-07-24 11:00:39 -07:00
parent 511bda8fe1
commit 621d7fb759
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/hv/netvsc_drv.c
View File

@@ -209,14 +209,14 @@ static int netvsc_probe(struct device *device)
net_device_ctx = netdev_priv(net); net_device_ctx = netdev_priv(net);
net_device_ctx->device_ctx = device_ctx; net_device_ctx->device_ctx = device_ctx;
device->driver_data = net; dev_set_drvdata(device, net);
// Notify the netvsc driver of the new device // Notify the netvsc driver of the new device
ret = net_drv_obj->Base.OnDeviceAdd(device_obj, (void*)&device_info); ret = net_drv_obj->Base.OnDeviceAdd(device_obj, (void*)&device_info);
if (ret != 0) if (ret != 0)
{ {
free_netdev(net); free_netdev(net);
device->driver_data = NULL; dev_set_drvdata(device, NULL);
DPRINT_ERR(NETVSC_DRV, "unable to add netvsc device (ret %d)", ret); DPRINT_ERR(NETVSC_DRV, "unable to add netvsc device (ret %d)", ret);
return 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; NETVSC_DRIVER_OBJECT *net_drv_obj = &net_drv_ctx->drv_obj;
struct device_context *device_ctx = device_to_device_context(device); 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; DEVICE_OBJECT *device_obj = &device_ctx->device_obj;
DPRINT_ENTER(NETVSC_DRV); 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) static void netvsc_linkstatus_callback(DEVICE_OBJECT *device_obj, unsigned int status)
{ {
struct device_context* device_ctx = to_device_context(device_obj); 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); DPRINT_ENTER(NETVSC_DRV);
@@ -571,7 +571,7 @@ static int netvsc_recv_callback(DEVICE_OBJECT *device_obj, NETVSC_PACKET* packet
{ {
int ret=0; int ret=0;
struct device_context *device_ctx = to_device_context(device_obj); 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 net_device_context *net_device_ctx;
struct sk_buff *skb; struct sk_buff *skb;