Skip to content

Commit

Permalink
staging: hv: change rndis_filter_device_remove() to void return type
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent ca06a22 commit df06bcf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/hv/hyperv_net.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ int rndis_filter_open(struct hv_device *dev);
int rndis_filter_close(struct hv_device *dev);
int rndis_filte_device_add(struct hv_device *dev,
void *additional_info);
int rndis_filter_device_remove(struct hv_device *dev);
void rndis_filter_device_remove(struct hv_device *dev);
int rndis_filter_receive(struct hv_device *dev,
struct hv_netvsc_packet *pkt);

Expand Down
9 changes: 2 additions & 7 deletions drivers/staging/hv/netvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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 */
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/hv/rndis_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ int rndis_filte_device_add(struct hv_device *dev,
return ret;
}

int rndis_filter_device_remove(struct hv_device *dev)
void rndis_filter_device_remove(struct hv_device *dev)
{
struct netvsc_device *net_dev = dev->ext;
struct rndis_device *rndis_dev = net_dev->extension;
Expand All @@ -753,8 +753,6 @@ int rndis_filter_device_remove(struct hv_device *dev)
net_dev->extension = NULL;

netvsc_device_remove(dev);

return 0;
}


Expand Down

0 comments on commit df06bcf

Please sign in to comment.