From: K. Y. Srinivasan <kys@microsoft.com>
Date: Tue, 10 May 2011 14:54:59 +0000 (-0700)
Subject: Staging: hv: Get rid of the indirection to invoke rndis_filte_device_add()
X-Git-Tag: Ubuntu-5.10.0-12.13~24358^2~361
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bc2d59757d068350814e9eec818c3438798a99ee;p=mirror_ubuntu-hirsute-kernel.git

Staging: hv: Get rid of the indirection to invoke rndis_filte_device_add()

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index f4c600071b1a..d962308926f0 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -349,9 +349,6 @@ static int netvsc_probe(struct hv_device *dev)
 	struct netvsc_device_info device_info;
 	int ret;
 
-	if (!net_drv_obj->base.dev_add)
-		return -1;
-
 	net = alloc_etherdev(sizeof(struct net_device_context));
 	if (!net)
 		return -1;
@@ -366,7 +363,7 @@ static int netvsc_probe(struct hv_device *dev)
 	INIT_WORK(&net_device_ctx->work, netvsc_send_garp);
 
 	/* Notify the netvsc driver of the new device */
-	ret = net_drv_obj->base.dev_add(dev, &device_info);
+	ret = rndis_filte_device_add(dev, &device_info);
 	if (ret != 0) {
 		free_netdev(net);
 		dev_set_drvdata(&dev->device, NULL);