evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: unisys: refactor VISORCHIPSET_ADDRESSTYPE

Browse source 
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@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Benjamin Romer 2014-10-31 09:57:21 -04:00 • committed by Greg Kroah-Hartman
parent 37951dabd8
commit 6fb23e1894
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/unisys/visorchipset/visorchipset.h
View file

@ -40,18 +40,18 @@ struct visorchipset_state {
/* Remaining bits in this 32-bit word are unused. */ /* Remaining bits in this 32-bit word are unused. */
}; };
typedef enum { enum visorchipset_addresstype {
/** address is guest physical, but outside of the physical memory /** address is guest physical, but outside of the physical memory
* region that is controlled by the running OS (this is the normal * region that is controlled by the running OS (this is the normal
* address type for Supervisor channels) * address type for Supervisor channels)
*/ */
ADDRTYPE_localPhysical, ADDRTYPE_LOCALPHYSICAL,
/** address is guest physical, and withIN the confines of the /** address is guest physical, and withIN the confines of the
* physical memory controlled by the running OS. * physical memory controlled by the running OS.
*/ */
ADDRTYPE_localTest, ADDRTYPE_LOCALTEST,
} VISORCHIPSET_ADDRESSTYPE; };
typedef enum { typedef enum {
CRASH_dev, CRASH_dev,
@ -61,7 +61,7 @@ typedef enum {
/** Attributes for a particular Supervisor channel. /** Attributes for a particular Supervisor channel.
*/ */
typedef struct { typedef struct {
VISORCHIPSET_ADDRESSTYPE addrType; enum visorchipset_addresstype addrType;
HOSTADDRESS channelAddr; HOSTADDRESS channelAddr;
struct irq_info intr; struct irq_info intr;
u64 nChannelBytes; u64 nChannelBytes;

8
drivers/staging/unisys/visorchipset/visorchipset_main.c
View file

@ -1130,9 +1130,9 @@ bus_create(struct controlvm_message *inmsg)
POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, busNo, POSTCODE_SEVERITY_INFO); POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, busNo, POSTCODE_SEVERITY_INFO);
if (inmsg->hdr.flags.test_message == 1) if (inmsg->hdr.flags.test_message == 1)
pBusInfo->chanInfo.addrType = ADDRTYPE_localTest; pBusInfo->chanInfo.addrType = ADDRTYPE_LOCALTEST;
else else
pBusInfo->chanInfo.addrType = ADDRTYPE_localPhysical; pBusInfo->chanInfo.addrType = ADDRTYPE_LOCALPHYSICAL;
pBusInfo->flags.server = inmsg->hdr.flags.server; pBusInfo->flags.server = inmsg->hdr.flags.server;
pBusInfo->chanInfo.channelAddr = cmd->create_bus.channel_addr; pBusInfo->chanInfo.channelAddr = cmd->create_bus.channel_addr;
@ -1280,9 +1280,9 @@ my_device_create(struct controlvm_message *inmsg)
POSTCODE_SEVERITY_INFO); POSTCODE_SEVERITY_INFO);
if (inmsg->hdr.flags.test_message == 1) if (inmsg->hdr.flags.test_message == 1)
pDevInfo->chanInfo.addrType = ADDRTYPE_localTest; pDevInfo->chanInfo.addrType = ADDRTYPE_LOCALTEST;
else else
pDevInfo->chanInfo.addrType = ADDRTYPE_localPhysical; pDevInfo->chanInfo.addrType = ADDRTYPE_LOCALPHYSICAL;
pDevInfo->chanInfo.channelAddr = cmd->create_device.channel_addr; pDevInfo->chanInfo.channelAddr = cmd->create_device.channel_addr;
pDevInfo->chanInfo.nChannelBytes = cmd->create_device.channel_bytes; pDevInfo->chanInfo.nChannelBytes = cmd->create_device.channel_bytes;
pDevInfo->chanInfo.channelTypeGuid = cmd->create_device.data_type_uuid; pDevInfo->chanInfo.channelTypeGuid = cmd->create_device.data_type_uuid;