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

Commit 4f28900b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: hv: remove unneeded OnClose callback 



This callback only calls one function, so just call the function
instead, no need for indirection at all.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2d075346

drivers/staging/hv/NetVscApi.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ struct netvsc_driver { 
	void (*OnLinkStatusChanged)(struct hv_device *dev, u32 Status);



	/* Specific to this driver */

	int (*OnClose)(struct hv_device *dev);

	int (*OnSend)(struct hv_device *dev, struct hv_netvsc_packet *packet);



	void *Context;
@@ -119,5 +118,6 @@ struct netvsc_device_info { 
/* Interface */

int NetVscInitialize(struct hv_driver *drv);

int RndisFilterOnOpen(struct hv_device *Device);

int RndisFilterOnClose(struct hv_device *Device);



#endif /* _NETVSC_API_H_ */

drivers/staging/hv/RndisFilter.c

+1 −4
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ static int RndisFilterOnDeviceRemove(struct hv_device *Device); 


static void RndisFilterOnCleanup(struct hv_driver *Driver);



static int RndisFilterOnClose(struct hv_device *Device);



static int RndisFilterOnSend(struct hv_device *Device,

			     struct hv_netvsc_packet *Packet);
@@ -652,7 +650,6 @@ int RndisFilterInit(struct netvsc_driver *Driver) 
	Driver->Base.OnDeviceRemove = RndisFilterOnDeviceRemove;

	Driver->Base.OnCleanup = RndisFilterOnCleanup;

	Driver->OnSend = RndisFilterOnSend;

	Driver->OnClose = RndisFilterOnClose;

	/* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */

	Driver->OnReceiveCallback = RndisFilterOnReceive;
@@ -900,7 +897,7 @@ int RndisFilterOnOpen(struct hv_device *Device) 
	return ret;

}



static int RndisFilterOnClose(struct hv_device *Device)

int RndisFilterOnClose(struct hv_device *Device)

{

	int ret;

	struct netvsc_device *netDevice = Device->Extension;

drivers/staging/hv/netvsc_drv.c

+1 −6
Original line number Diff line number Diff line
@@ -101,11 +101,6 @@ static int netvsc_open(struct net_device *net) 
static int netvsc_close(struct net_device *net)

{

	struct net_device_context *net_device_ctx = netdev_priv(net);

	struct driver_context *driver_ctx =

	    driver_to_driver_context(net_device_ctx->device_ctx->device.driver);

	struct netvsc_driver_context *net_drv_ctx =

		(struct netvsc_driver_context *)driver_ctx;

	struct netvsc_driver *net_drv_obj = &net_drv_ctx->drv_obj;

	struct hv_device *device_obj = &net_device_ctx->device_ctx->device_obj;

	int ret;
@@ -113,7 +108,7 @@ static int netvsc_close(struct net_device *net) 


	netif_stop_queue(net);



	ret = net_drv_obj->OnClose(device_obj);

	ret = RndisFilterOnClose(device_obj);

	if (ret != 0)

		DPRINT_ERR(NETVSC_DRV, "unable to close device (ret %d).", ret);