Staging: hv: netvsc: Rename netDevice as net_device

Rename netDevice as net_device.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 2bcc8b2b9b371e8aba7e588f3a35f8d99115bc1c..b902579c7fe6802c26e7eb6882a37793ab7ce6e1 100644 (file)
--- 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 b354b0b62364f41e8adf03fd6e7eb24acd993381..efa7df5b1f8048b805f25acb18c20a3ef73e1aba 100644 (file)
--- 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)