From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754531Ab1HYQk6 (ORCPT ); Thu, 25 Aug 2011 12:40:58 -0400 Received: from p3plsmtps2ded01.prod.phx3.secureserver.net ([208.109.80.58]:42746 "HELO p3plsmtps2ded01-02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753375Ab1HYQ2z (ORCPT ); Thu, 25 Aug 2011 12:28:55 -0400 From: "K. Y. Srinivasan" To: gregkh@suse.de, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, virtualization@lists.osdl.org Cc: "K. Y. Srinivasan" , Haiyang Zhang Subject: [PATCH 20/59] Staging: hv: netvsc: Initialize the driver name directly Date: Thu, 25 Aug 2011 09:48:46 -0700 Message-Id: <1314290965-2698-20-git-send-email-kys@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314290965-2698-1-git-send-email-kys@microsoft.com> References: <1314290866-2644-1-git-send-email-kys@microsoft.com> <1314290965-2698-1-git-send-email-kys@microsoft.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Initialize the driver name directly in netvsc_drv.c and do the necessary adjustments. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang --- drivers/staging/hv/netvsc.c | 5 ----- drivers/staging/hv/netvsc_drv.c | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c index 6f4541b..d085018 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/staging/hv/netvsc.c @@ -32,9 +32,6 @@ #include "hyperv_net.h" -/* Globals */ -static const char *driver_name = "netvsc"; - static struct netvsc_device *alloc_net_device(struct hv_device *device) { struct netvsc_device *net_device; @@ -999,7 +996,5 @@ cleanup: int netvsc_initialize(struct hv_driver *drv) { - drv->name = driver_name; - return 0; } diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index d6c6180..61de6f2 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -41,6 +41,8 @@ #include "hyperv.h" #include "hyperv_net.h" +static const char *driver_name = "netvsc"; + struct net_device_context { /* point back to our device context */ struct hv_device *device_ctx; @@ -449,7 +451,7 @@ static int __init netvsc_drv_init(void) /* Callback to client driver to complete the initialization */ netvsc_initialize(drv); - drv->driver.name = drv->name; + drv->driver.name = driver_name; /* The driver belongs to vmbus */ ret = vmbus_child_driver_register(&drv->driver); -- 1.7.4.1