staging: hv: Convert camel cased struct fields in vmbus_channel_interface.h to lower...

Signed-off-by: Haiyang Zhang <haiyangz@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/channel.c b/drivers/staging/hv/channel.c
index 960e155d34ef076f38f200e5e4dadcbe0b65b1e9..711548fd91604acc90db92024fc92c6f037b9692 100644 (file)
--- a/drivers/staging/hv/channel.c
+++ b/drivers/staging/hv/channel.c
@@ -128,9 +128,9 @@ void vmbus_get_debug_info(struct vmbus_channel *channel,
        debuginfo->relid = channel->offermsg.child_relid;
        debuginfo->state = channel->state;
        memcpy(&debuginfo->interfacetype,
-              &channel->offermsg.offer.InterfaceType, sizeof(struct hv_guid));
+              &channel->offermsg.offer.if_type, sizeof(struct hv_guid));
        memcpy(&debuginfo->interface_instance,
-              &channel->offermsg.offer.InterfaceInstance,
+              &channel->offermsg.offer.if_instance,
               sizeof(struct hv_guid));
 
        monitorpage = (struct hv_monitor_page *)vmbus_connection.MonitorPages;

diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index b4a856155b29a559cc1936ebdb062034fe1310a7..3e229fa178e8c13788451a8bb09227ba2f7c6ca9 100644 (file)
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/staging/hv/channel_mgmt.c
@@ -364,11 +364,11 @@ static void vmbus_process_offer(struct work_struct *work)
        spin_lock_irqsave(&vmbus_connection.channel_lock, flags);
 
        list_for_each_entry(channel, &vmbus_connection.ChannelList, listentry) {
-               if (!memcmp(&channel->offermsg.offer.InterfaceType,
-                           &newchannel->offermsg.offer.InterfaceType,
+               if (!memcmp(&channel->offermsg.offer.if_type,
+                           &newchannel->offermsg.offer.if_type,
                            sizeof(struct hv_guid)) &&
-                   !memcmp(&channel->offermsg.offer.InterfaceInstance,
-                           &newchannel->offermsg.offer.InterfaceInstance,
+                   !memcmp(&channel->offermsg.offer.if_instance,
+                           &newchannel->offermsg.offer.if_instance,
                            sizeof(struct hv_guid))) {
                        fnew = false;
                        break;
@@ -394,8 +394,8 @@ static void vmbus_process_offer(struct work_struct *work)
         * vmbus_child_dev_add()
         */
        newchannel->device_obj = vmbus_child_device_create(
-               &newchannel->offermsg.offer.InterfaceType,
-               &newchannel->offermsg.offer.InterfaceInstance,
+               &newchannel->offermsg.offer.if_type,
+               &newchannel->offermsg.offer.if_instance,
                newchannel);
 
        DPRINT_DBG(VMBUS, "child device object allocated - %p",
@@ -427,7 +427,7 @@ static void vmbus_process_offer(struct work_struct *work)
 
                /* Open IC channels */
                for (cnt = 0; cnt < MAX_MSG_TYPES; cnt++) {
-                       if (memcmp(&newchannel->offermsg.offer.InterfaceType,
+                       if (memcmp(&newchannel->offermsg.offer.if_type,
                                   &hv_cb_utils[cnt].data,
                                   sizeof(struct hv_guid)) == 0 &&
                                vmbus_open(newchannel, 2 * PAGE_SIZE,
@@ -461,7 +461,7 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
 
        offer = (struct vmbus_channel_offer_channel *)hdr;
        for (i = 0; i < MAX_NUM_DEVICE_CLASSES_SUPPORTED; i++) {
-               if (memcmp(&offer->offer.InterfaceType,
+               if (memcmp(&offer->offer.if_type,
                    &gSupportedDeviceClasses[i], sizeof(struct hv_guid)) == 0) {
                        fsupported = 1;
                        break;
@@ -474,8 +474,8 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
                return;
        }
 
-       guidtype = &offer->offer.InterfaceType;
-       guidinstance = &offer->offer.InterfaceInstance;
+       guidtype = &offer->offer.if_type;
+       guidinstance = &offer->offer.if_instance;
 
        DPRINT_INFO(VMBUS, "Channel offer notification - "
                    "child relid %d monitor id %d allocated %d, "

diff --git a/drivers/staging/hv/vmbus_channel_interface.h b/drivers/staging/hv/vmbus_channel_interface.h
index 26742823748d3d46e7bfd707827701d0b973d899..fbfad5e8b92df7da29e38183461e4d68969f03e5 100644 (file)
--- a/drivers/staging/hv/vmbus_channel_interface.h
+++ b/drivers/staging/hv/vmbus_channel_interface.h
@@ -48,19 +48,19 @@
  * struct contains the fundamental information about an offer.
  */
 struct vmbus_channel_offer {
-       struct hv_guid InterfaceType;
-       struct hv_guid InterfaceInstance;
-       u64 InterruptLatencyIn100nsUnits;
-       u32 InterfaceRevision;
-       u32 ServerContextAreaSize;      /* in bytes */
-       u16 ChannelFlags;
-       u16 MmioMegabytes;              /* in bytes * 1024 * 1024 */
+       struct hv_guid if_type;
+       struct hv_guid if_instance;
+       u64 int_latency; /* in 100ns units */
+       u32 if_revision;
+       u32 server_ctx_size;    /* in bytes */
+       u16 chn_flags;
+       u16 mmio_megabytes;             /* in bytes * 1024 * 1024 */
 
        union {
                /* Non-pipes: The user has MAX_USER_DEFINED_BYTES bytes. */
                struct {
-                       unsigned char UserDefined[MAX_USER_DEFINED_BYTES];
-               } Standard;
+                       unsigned char user_def[MAX_USER_DEFINED_BYTES];
+               } std;
 
                /*
                 * Pipes:
@@ -70,11 +70,11 @@ struct vmbus_channel_offer {
                 * use.
                 */
                struct {
-                       u32  PipeMode;
-                       unsigned char UserDefined[MAX_PIPE_USER_DEFINED_BYTES];
-               } Pipe;
+                       u32  pipe_mode;
+                       unsigned char user_def[MAX_PIPE_USER_DEFINED_BYTES];
+               } pipe;
        } u;
-       u32 Padding;
+       u32 padding;
 } __attribute__((packed));
 
 /* Server Flags */