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: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/NetVscApi.h b/drivers/staging/hv/NetVscApi.h
index 1ce2b74a34a73d62cb35cd14c34564d74d170c80..93b9226ff3b5857ed9e57a9f20c41e497968d514 100644 (file)
--- a/drivers/staging/hv/NetVscApi.h
+++ b/drivers/staging/hv/NetVscApi.h
@@ -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_ */

diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index 26d79975387cc0b09e3335b8aeffc1b28af457ab..74f741eb1296053f5b4472884fdef441bdc8e986 100644 (file)
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -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;

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 0d7459e2d0360b8996b104e1385df56bd9fd8150..515cd2361bf27215d55cf237ff3c3309b4ade831 100644 (file)
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -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);