Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/hv/hyperv_net.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/hv/netvsc_drv.c

+2 −7
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/hv/rndis_filter.c

+1 −3
Original line number Diff line number Diff line
@@ -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;
@@ -753,8 +753,6 @@ int rndis_filter_device_remove(struct hv_device *dev) 
	net_dev->extension = NULL;



	netvsc_device_remove(dev);



	return 0;

}