public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@suse.de, linux-kernel@vger.kernel.org,
	devel@linuxdriverproject.org, virtualization@lists.osdl.org
Cc: "K. Y. Srinivasan" <kys@microsoft.com>,
	Haiyang Zhang <haiyangz@microsoft.com>
Subject: [PATCH 18/20] Staging: hv: netvsc: Rename netDevice as net_device
Date: Tue, 13 Sep 2011 10:59:54 -0700	[thread overview]
Message-ID: <1315936796-20662-18-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1315936796-20662-1-git-send-email-kys@microsoft.com>

Rename netDevice as net_device.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
---
 drivers/staging/hv/netvsc.c       |    5 ++++-
 drivers/staging/hv/rndis_filter.c |   14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 2bcc8b2..b902579 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -382,7 +382,10 @@ int netvsc_device_remove(struct hv_device *device)
 	hv_set_drvdata(device, NULL);
 	spin_unlock_irqrestore(&device->channel->inbound_lock, flags);
 
-	/* At this point, no one should be accessing netDevice except in here */
+	/*
+	 * At this point, no one should be accessing net_device
+	 * except in here
+	 */
 	dev_notice(&device->device, "net device safe to remove\n");
 
 	/* Now, we can close the channel safely */
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
index b354b0b..efa7df5 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@ -689,7 +689,7 @@ int rndis_filter_device_add(struct hv_device *dev,
 				  void *additional_info)
 {
 	int ret;
-	struct netvsc_device *netDevice;
+	struct netvsc_device *net_device;
 	struct rndis_device *rndisDevice;
 	struct netvsc_device_info *deviceInfo = additional_info;
 
@@ -710,10 +710,10 @@ int rndis_filter_device_add(struct hv_device *dev,
 
 
 	/* Initialize the rndis device */
-	netDevice = hv_get_drvdata(dev);
+	net_device = hv_get_drvdata(dev);
 
-	netDevice->extension = rndisDevice;
-	rndisDevice->net_dev = netDevice;
+	net_device->extension = rndisDevice;
+	rndisDevice->net_dev = net_device;
 
 	/* Send the rndis initialization message */
 	ret = rndis_filter_init_device(rndisDevice);
@@ -762,12 +762,12 @@ void rndis_filter_device_remove(struct hv_device *dev)
 
 int rndis_filter_open(struct hv_device *dev)
 {
-	struct netvsc_device *netDevice = hv_get_drvdata(dev);
+	struct netvsc_device *net_device = hv_get_drvdata(dev);
 
-	if (!netDevice)
+	if (!net_device)
 		return -EINVAL;
 
-	return rndis_filter_open_device(netDevice->extension);
+	return rndis_filter_open_device(net_device->extension);
 }
 
 int rndis_filter_close(struct hv_device *dev)
-- 
1.7.4.1


  parent reply	other threads:[~2011-09-13 17:38 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-13 17:59 [PATCH 0000/0020] Staging: hv: Driver cleanup K. Y. Srinivasan
2011-09-13 17:59 ` [PATCH 01/20] Staging: hv: vmbus: Introduce a utility function to match hv_vmbus_device_id K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 02/20] Staging: hv: vmbus: Change the signature of struct hv_driver probe function K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 03/20] Staging: hv: storvsc: Use the driver_data to identify ide K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 04/20] Staging: hv: vmbus: Introduce functions for setting and getting driver data K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 05/20] Staging: hv: util: Perform some service specific init/deinit in probe/remove K. Y. Srinivasan
2011-09-16 18:01     ` Greg KH
2011-09-13 17:59   ` [PATCH 06/20] Staging: hv: util: Properly handle util services in the util driver K. Y. Srinivasan
2011-09-15 20:08     ` Dan Carpenter
2011-09-15 20:24       ` KY Srinivasan
2011-09-16 18:03     ` Greg KH
2011-09-17 13:26       ` KY Srinivasan
2011-09-13 17:59   ` [PATCH 07/20] Staging: hv: vmbus: Get rid of hv_cb_utils[] and other unneeded code K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 08/20] Staging: hv: vmbus: Cleanup vmbus_remove() K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 09/20] Staging: hv: storvsc: Get rid of storvsc_dev_add() by inlining the code K. Y. Srinivasan
2011-09-13 18:39     ` Christoph Hellwig
2011-09-13 18:52       ` KY Srinivasan
2011-09-13 17:59   ` [PATCH 10/20] Staging: hv: storvsc: Get rid of alloc_stor_device() " K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 11/20] Staging: hv: storvsc: Get rid of some unnecessary state and definitions K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 12/20] Staging: hv: storvsc: Eliminate the usage of ext field in struct hv_device K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 13/20] Staging: hv: netvsc: Get rid of the usage of the " K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 14/20] Staging: hv: mousevsc: " K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 15/20] Staging: hv: vmbus: Get rid " K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 16/20] Staging: hv: vmbus: Do not allocate struct hv_device_info on the stack K. Y. Srinivasan
2011-09-13 18:41     ` Christoph Hellwig
2011-09-13 17:59   ` [PATCH 17/20] Staging: hv: vmbus: Get rid of the module dependency K. Y. Srinivasan
2011-09-13 17:59   ` K. Y. Srinivasan [this message]
2011-09-13 17:59   ` [PATCH 19/20] Staging: hv: netvsc: Rename rndisDevice to rndis_device K. Y. Srinivasan
2011-09-13 17:59   ` [PATCH 20/20] Staging: hv: netvsc: Rename deviceInfo as device_info K. Y. Srinivasan
2011-09-13 18:10     ` Joe Perches
2011-09-13 18:15       ` KY Srinivasan
2011-09-16 18:07 ` [PATCH 0000/0020] Staging: hv: Driver cleanup Greg KH
2011-09-17 13:26   ` KY Srinivasan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1315936796-20662-18-git-send-email-kys@microsoft.com \
    --to=kys@microsoft.com \
    --cc=devel@linuxdriverproject.org \
    --cc=gregkh@suse.de \
    --cc=haiyangz@microsoft.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=virtualization@lists.osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox