Commit e6ad00bb authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: refactor CONTROLVM_PACKET_DEVICE_CONFIGURE

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: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f91b9262
...@@ -227,13 +227,13 @@ struct controlvm_packet_device_create { ...@@ -227,13 +227,13 @@ struct controlvm_packet_device_create {
struct irq_info intr; /* specifies interrupt information */ struct irq_info intr; /* specifies interrupt information */
}; /* for CONTROLVM_DEVICE_CREATE */ }; /* for CONTROLVM_DEVICE_CREATE */
typedef struct _CONTROLVM_PACKET_DEVICE_CONFIGURE { struct controlvm_packet_device_configure {
u32 busNo; /**< bus # (0..n-1) from the msg u32 bus_no; /**< bus # (0..n-1) from the msg
* receiver's perspective */ * receiver's perspective */
/* Control uses header SegmentIndex field to access bus number... */ /* Control uses header SegmentIndex field to access bus number... */
u32 devNo; /**< bus-relative (0..n-1) device number */ u32 dev_no; /**< bus-relative (0..n-1) device number */
} CONTROLVM_PACKET_DEVICE_CONFIGURE; /* for CONTROLVM_DEVICE_CONFIGURE */ } ; /* for CONTROLVM_DEVICE_CONFIGURE */
typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE { typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE {
struct controlvm_message_header Header; struct controlvm_message_header Header;
...@@ -242,7 +242,7 @@ typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE { ...@@ -242,7 +242,7 @@ typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE {
typedef struct _CONTROLVM_MESSAGE_DEVICE_CONFIGURE { typedef struct _CONTROLVM_MESSAGE_DEVICE_CONFIGURE {
struct controlvm_message_header Header; struct controlvm_message_header Header;
CONTROLVM_PACKET_DEVICE_CONFIGURE Packet; struct controlvm_packet_device_configure Packet;
} CONTROLVM_MESSAGE_DEVICE_CONFIGURE; /* total 56 bytes */ } CONTROLVM_MESSAGE_DEVICE_CONFIGURE; /* total 56 bytes */
/* This is the format for a message in any ControlVm queue. */ /* This is the format for a message in any ControlVm queue. */
...@@ -289,7 +289,7 @@ struct controlvm_message_packet { ...@@ -289,7 +289,7 @@ struct controlvm_message_packet {
u32 dev_no; /* bus-relative (0..n-1) device # */ u32 dev_no; /* bus-relative (0..n-1) device # */
} destroy_device; /* for CONTROLVM_DEVICE_DESTROY */ } destroy_device; /* for CONTROLVM_DEVICE_DESTROY */
/* for CONTROLVM_DEVICE_CONFIGURE */ /* for CONTROLVM_DEVICE_CONFIGURE */
CONTROLVM_PACKET_DEVICE_CONFIGURE configure_device; struct controlvm_packet_device_configure configure_device;
struct { struct {
u32 bus_no; /* bus # (0..n-1) from the msg u32 bus_no; /* bus # (0..n-1) from the msg
* receiver's perspective */ * receiver's perspective */
......
...@@ -1880,8 +1880,8 @@ handle_command(CONTROLVM_MESSAGE inmsg, HOSTADDRESS channel_addr) ...@@ -1880,8 +1880,8 @@ handle_command(CONTROLVM_MESSAGE inmsg, HOSTADDRESS channel_addr)
break; break;
case CONTROLVM_DEVICE_CONFIGURE: case CONTROLVM_DEVICE_CONFIGURE:
LOGINF("DEVICE_CONFIGURE(%lu,%lu)", LOGINF("DEVICE_CONFIGURE(%lu,%lu)",
(ulong) cmd->configure_device.busNo, (ulong) cmd->configure_device.bus_no,
(ulong) cmd->configure_device.devNo); (ulong) cmd->configure_device.dev_no);
/* no op for now, just send a respond that we passed */ /* no op for now, just send a respond that we passed */
if (inmsg.hdr.flags.response_expected) if (inmsg.hdr.flags.response_expected)
controlvm_respond(&inmsg.hdr, CONTROLVM_RESP_SUCCESS); controlvm_respond(&inmsg.hdr, CONTROLVM_RESP_SUCCESS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment