Skip to content

Commit

Permalink
staging: hv: Convert camel cased struct fields in vmbus_channel_inter…
Browse files Browse the repository at this point in the history
…face.h to lower cases

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>
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Jan 31, 2011
1 parent ca623ad commit 767dff6
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/hv/channel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions drivers/staging/hv/channel_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand All @@ -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, "
Expand Down
26 changes: 13 additions & 13 deletions drivers/staging/hv/vmbus_channel_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 */
Expand Down

0 comments on commit 767dff6

Please sign in to comment.