Remove the typedef from CONTROLVM_PACKET_DEVICE_CONFIGURE, in favor of
struct controlvm_packet_device_configure. Fix CamelCase names and update
all references to modified names.
busNo => bus_no
devNo => dev_no
Signed-off-by: Benjamin Romer <benjamin.ro...@unisys.com>
---
.../unisys/common-spar/include/channels/controlvmchannel.h | 12 ++++++------
drivers/staging/unisys/visorchipset/visorchipset_main.c | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
index 78c4b33..7a5524d 100644
--- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
@@ -227,13 +227,13 @@ struct controlvm_packet_device_create {
struct irq_info intr; /* specifies interrupt information */
}; /* for CONTROLVM_DEVICE_CREATE */
-typedef struct _CONTROLVM_PACKET_DEVICE_CONFIGURE {
- u32 busNo; /**< bus # (0..n-1) from the msg
+struct controlvm_packet_device_configure {
+ u32 bus_no; /**< bus # (0..n-1) from the msg
* receiver's perspective */
/* Control uses header SegmentIndex field to access bus number... */
- u32 devNo; /**< bus-relative (0..n-1) device number */
-} CONTROLVM_PACKET_DEVICE_CONFIGURE; /* for CONTROLVM_DEVICE_CONFIGURE */
+ u32 dev_no; /**< bus-relative (0..n-1) device number */
+} ; /* for CONTROLVM_DEVICE_CONFIGURE */
typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE {
struct controlvm_message_header Header;
@@ -242,7 +242,7 @@ typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE {
typedef struct _CONTROLVM_MESSAGE_DEVICE_CONFIGURE {
struct controlvm_message_header Header;
- CONTROLVM_PACKET_DEVICE_CONFIGURE Packet;
+ struct controlvm_packet_device_configure Packet;
} CONTROLVM_MESSAGE_DEVICE_CONFIGURE; /* total 56 bytes */
/* This is the format for a message in any ControlVm queue. */
@@ -289,7 +289,7 @@ struct controlvm_message_packet {
u32 dev_no; /* bus-relative (0..n-1) device # */
} destroy_device; /* for CONTROLVM_DEVICE_DESTROY */
/* for CONTROLVM_DEVICE_CONFIGURE */
- CONTROLVM_PACKET_DEVICE_CONFIGURE configure_device;
+ struct controlvm_packet_device_configure configure_device;
struct {
u32 bus_no; /* bus # (0..n-1) from the msg
* receiver's perspective */
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c
b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index d7f644a..753ea99 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -1880,8 +1880,8 @@ handle_command(CONTROLVM_MESSAGE inmsg, HOSTADDRESS
channel_addr)
break;
case CONTROLVM_DEVICE_CONFIGURE:
LOGINF("DEVICE_CONFIGURE(%lu,%lu)",
- (ulong) cmd->configure_device.busNo,
- (ulong) cmd->configure_device.devNo);
+ (ulong) cmd->configure_device.bus_no,
+ (ulong) cmd->configure_device.dev_no);
/* no op for now, just send a respond that we passed */
if (inmsg.hdr.flags.response_expected)
controlvm_respond(&inmsg.hdr, CONTROLVM_RESP_SUCCESS);
--
1.9.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
