Commit df06bcff authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Greg Kroah-Hartman

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: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ca06a22a
...@@ -101,7 +101,7 @@ int rndis_filter_open(struct hv_device *dev); ...@@ -101,7 +101,7 @@ int rndis_filter_open(struct hv_device *dev);
int rndis_filter_close(struct hv_device *dev); int rndis_filter_close(struct hv_device *dev);
int rndis_filte_device_add(struct hv_device *dev, int rndis_filte_device_add(struct hv_device *dev,
void *additional_info); 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, int rndis_filter_receive(struct hv_device *dev,
struct hv_netvsc_packet *pkt); struct hv_netvsc_packet *pkt);
......
...@@ -387,7 +387,6 @@ static int netvsc_probe(struct hv_device *dev) ...@@ -387,7 +387,6 @@ static int netvsc_probe(struct hv_device *dev)
static int netvsc_remove(struct hv_device *dev) static int netvsc_remove(struct hv_device *dev)
{ {
struct net_device *net = dev_get_drvdata(&dev->device); struct net_device *net = dev_get_drvdata(&dev->device);
int ret;
if (net == NULL) { if (net == NULL) {
dev_err(&dev->device, "No net device to remove\n"); dev_err(&dev->device, "No net device to remove\n");
...@@ -404,14 +403,10 @@ static int netvsc_remove(struct hv_device *dev) ...@@ -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 * Call to the vsc driver to let it know that the device is being
* removed * removed
*/ */
ret = rndis_filter_device_remove(dev); rndis_filter_device_remove(dev);
if (ret != 0) {
/* TODO: */
netdev_err(net, "unable to remove vsc device (ret %d)\n", ret);
}
free_netdev(net); free_netdev(net);
return ret; return 0;
} }
/* The one and only one */ /* The one and only one */
......
...@@ -741,7 +741,7 @@ int rndis_filte_device_add(struct hv_device *dev, ...@@ -741,7 +741,7 @@ int rndis_filte_device_add(struct hv_device *dev,
return ret; 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 netvsc_device *net_dev = dev->ext;
struct rndis_device *rndis_dev = net_dev->extension; struct rndis_device *rndis_dev = net_dev->extension;
...@@ -753,8 +753,6 @@ int rndis_filter_device_remove(struct hv_device *dev) ...@@ -753,8 +753,6 @@ int rndis_filter_device_remove(struct hv_device *dev)
net_dev->extension = NULL; net_dev->extension = NULL;
netvsc_device_remove(dev); netvsc_device_remove(dev);
return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment