diff options
| author | Haiyang Zhang | 2011-05-23 18:03:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-06-07 22:36:00 +0200 |
| commit | df06bcff819555bf9aca38b2f8263920836fe851 (patch) | |
| tree | 75b47830e4cb0e7b1874bcbefad60df0e3105bee /drivers/staging/hv/netvsc_drv.c | |
| parent | staging: hv: remove commented out code from netvsc_drv.c (diff) | |
| download | kernel-qcow2-linux-df06bcff819555bf9aca38b2f8263920836fe851.tar.gz kernel-qcow2-linux-df06bcff819555bf9aca38b2f8263920836fe851.tar.xz kernel-qcow2-linux-df06bcff819555bf9aca38b2f8263920836fe851.zip | |
staging: hv: change rndis_filter_device_remove() to void return type
rndis_filter_device_remove() always return 0, so change it to void return
type. Also cleaned up the error checking in the caller.
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index e716d4d86c8d..ad254335d955 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -387,7 +387,6 @@ static int netvsc_probe(struct hv_device *dev) static int netvsc_remove(struct hv_device *dev) { struct net_device *net = dev_get_drvdata(&dev->device); - int ret; if (net == NULL) { dev_err(&dev->device, "No net device to remove\n"); @@ -404,14 +403,10 @@ static int netvsc_remove(struct hv_device *dev) * Call to the vsc driver to let it know that the device is being * removed */ - ret = rndis_filter_device_remove(dev); - if (ret != 0) { - /* TODO: */ - netdev_err(net, "unable to remove vsc device (ret %d)\n", ret); - } + rndis_filter_device_remove(dev); free_netdev(net); - return ret; + return 0; } /* The one and only one */ |