From: Jeffrey <Jeffrey.Brown@xxxxxxxxxx> Changed the typedef struct CONTROLVM_PAYLOAD_INFO on line 107 to a normal struct and replaced every instnace of CONTROLVM_PAYLOAD_INFO with "struct CONTROLVM_PAYLOAD_INFO" Signed-off-by: Jeffrey Brown <Jeffrey.Brown@xxxxxxxxxx> --- drivers/staging/unisys/visorchipset/visorchipset_main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index 6977c8d..efb1729 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -104,15 +104,15 @@ static LIST_HEAD(devinfolist); static VISORCHANNEL *controlvm_channel; -typedef struct { +struct CONTROLVM_PAYLOAD_INFO { u8 __iomem *ptr; /* pointer to base address of payload pool */ u64 offset; /* offset from beginning of controlvm * channel to beginning of payload * pool */ u32 bytes; /* number of bytes in payload pool */ -} CONTROLVM_PAYLOAD_INFO; +}; /* Manages the request payload in the controlvm channel */ -static CONTROLVM_PAYLOAD_INFO controlvm_payload_info; +static struct CONTROLVM_PAYLOAD_INFO controlvm_payload_info; static struct channel_header *test_vnic_channel; @@ -1385,12 +1385,12 @@ cleanups: /* When provided with the physical address of the controlvm channel * (phys_addr), the offset to the payload area we need to manage * (offset), and the size of this payload area (bytes), fills in the - * CONTROLVM_PAYLOAD_INFO struct. Returns TRUE for success or FALSE + * struct CONTROLVM_PAYLOAD_INFO struct. Returns TRUE for success or FALSE * for failure. */ static int initialize_controlvm_payload_info(HOSTADDRESS phys_addr, u64 offset, u32 bytes, - CONTROLVM_PAYLOAD_INFO *info) + struct CONTROLVM_PAYLOAD_INFO *info) { u8 __iomem *payload = NULL; int rc = CONTROLVM_RESP_SUCCESS; @@ -1401,7 +1401,7 @@ initialize_controlvm_payload_info(HOSTADDRESS phys_addr, u64 offset, u32 bytes, rc = -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID; goto cleanups; } - memset(info, 0, sizeof(CONTROLVM_PAYLOAD_INFO)); + memset(info, 0, sizeof(struct CONTROLVM_PAYLOAD_INFO)); if ((offset == 0) || (bytes == 0)) { LOGERR("CONTROLVM_PAYLOAD_INIT Failed: request_payload_offset=%llu request_payload_bytes=%llu!", (u64)offset, (u64)bytes); @@ -1433,13 +1433,13 @@ cleanups: } static void -destroy_controlvm_payload_info(CONTROLVM_PAYLOAD_INFO *info) +destroy_controlvm_payload_info(struct CONTROLVM_PAYLOAD_INFO *info) { if (info->ptr != NULL) { iounmap(info->ptr); info->ptr = NULL; } - memset(info, 0, sizeof(CONTROLVM_PAYLOAD_INFO)); + memset(info, 0, sizeof(struct CONTROLVM_PAYLOAD_INFO)); } static void -- 1.8.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel