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

Commit 2d075346 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: hv: remove unneeded OnOpen 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 354b0a64

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 (*OnOpen)(struct hv_device *dev);

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

	int (*OnSend)(struct hv_device *dev, struct hv_netvsc_packet *packet);
@@ -119,5 +118,6 @@ struct netvsc_device_info { 


/* Interface */

int NetVscInitialize(struct hv_driver *drv);

int RndisFilterOnOpen(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 RndisFilterOnOpen(struct hv_device *Device);



static int RndisFilterOnClose(struct hv_device *Device);



static int RndisFilterOnSend(struct hv_device *Device,
@@ -654,7 +652,6 @@ int RndisFilterInit(struct netvsc_driver *Driver) 
	Driver->Base.OnDeviceRemove = RndisFilterOnDeviceRemove;

	Driver->Base.OnCleanup = RndisFilterOnCleanup;

	Driver->OnSend = RndisFilterOnSend;

	Driver->OnOpen = RndisFilterOnOpen;

	Driver->OnClose = RndisFilterOnClose;

	/* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */

	Driver->OnReceiveCallback = RndisFilterOnReceive;
@@ -888,7 +885,7 @@ static void RndisFilterOnCleanup(struct hv_driver *Driver) 
	DPRINT_EXIT(NETVSC);

}



static int RndisFilterOnOpen(struct hv_device *Device)

int RndisFilterOnOpen(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
@@ -72,11 +72,6 @@ static void netvsc_set_multicast_list(struct net_device *net) 
static int netvsc_open(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 = 0;
@@ -87,7 +82,7 @@ static int netvsc_open(struct net_device *net) 
		       sizeof(struct net_device_stats));



		/* Open up the device */

		ret = net_drv_obj->OnOpen(device_obj);

		ret = RndisFilterOnOpen(device_obj);

		if (ret != 0) {

			DPRINT_ERR(NETVSC_DRV,

				   "unable to open device (ret %d).", ret);