Get rid of VISORCHIPSET_ADDRESSTYPE and replace it with enum
visorchipset_addresstype. Fix CamelCase names:
ADDRTYPE_localPhysical => ADDRTYPE_LOCALPHYSICAL
ADDRTYPE_localTest => ADDRTYPE_LOCALTEST
Update all references to changed names.
Signed-off-by: Benjamin Romer <benjamin.romer@xxxxxxxxxx>
---
drivers/staging/unisys/visorchipset/visorchipset.h | 10 +++++-----
drivers/staging/unisys/visorchipset/visorchipset_main.c | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
index ef62f3a..6ca6580 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset.h
+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
@@ -40,18 +40,18 @@ struct visorchipset_state {
/* Remaining bits in this 32-bit word are unused. */
};
-typedef enum {
+enum visorchipset_addresstype {
/** address is guest physical, but outside of the physical memory
* region that is controlled by the running OS (this is the normal
* address type for Supervisor channels)
*/
- ADDRTYPE_localPhysical,
+ ADDRTYPE_LOCALPHYSICAL,
/** address is guest physical, and withIN the confines of the
* physical memory controlled by the running OS.
*/
- ADDRTYPE_localTest,
-} VISORCHIPSET_ADDRESSTYPE;
+ ADDRTYPE_LOCALTEST,
+};
typedef enum {
CRASH_dev,
@@ -61,7 +61,7 @@ typedef enum {
/** Attributes for a particular Supervisor channel.
*/
typedef struct {
- VISORCHIPSET_ADDRESSTYPE addrType;
+ enum visorchipset_addresstype addrType;
HOSTADDRESS channelAddr;
struct irq_info intr;
u64 nChannelBytes;
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 392e046..70a5489 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -1130,9 +1130,9 @@ bus_create(struct controlvm_message *inmsg)
POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, busNo, POSTCODE_SEVERITY_INFO);
if (inmsg->hdr.flags.test_message == 1)
- pBusInfo->chanInfo.addrType = ADDRTYPE_localTest;
+ pBusInfo->chanInfo.addrType = ADDRTYPE_LOCALTEST;
else
- pBusInfo->chanInfo.addrType = ADDRTYPE_localPhysical;
+ pBusInfo->chanInfo.addrType = ADDRTYPE_LOCALPHYSICAL;
pBusInfo->flags.server = inmsg->hdr.flags.server;
pBusInfo->chanInfo.channelAddr = cmd->create_bus.channel_addr;
@@ -1280,9 +1280,9 @@ my_device_create(struct controlvm_message *inmsg)
POSTCODE_SEVERITY_INFO);
if (inmsg->hdr.flags.test_message == 1)
- pDevInfo->chanInfo.addrType = ADDRTYPE_localTest;
+ pDevInfo->chanInfo.addrType = ADDRTYPE_LOCALTEST;
else
- pDevInfo->chanInfo.addrType = ADDRTYPE_localPhysical;
+ pDevInfo->chanInfo.addrType = ADDRTYPE_LOCALPHYSICAL;
pDevInfo->chanInfo.channelAddr = cmd->create_device.channel_addr;
pDevInfo->chanInfo.nChannelBytes = cmd->create_device.channel_bytes;
pDevInfo->chanInfo.channelTypeGuid = cmd->create_device.data_type_uuid;
--
2.1.0
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
