From: Jeffrey <Jeffrey.Brown@xxxxxxxxxx> Changed the camel cases for LIST_HEAD BusInfoList and DevInfoList BusInfoList => businfolist DevInfoList => devinfolist Signed-off-by: Jeffrey Brown <Jeffrey.Brown@xxxxxxxxxx> --- .../unisys/visorchipset/visorchipset_main.c | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index add38d5..789904a 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -99,8 +99,8 @@ static struct controlvm_message_packet g_devicechangestatepacket; #define is_diagpool_channel(channel_type_guid) \ (uuid_le_cmp(channel_type_guid, ultradiagpoolchannelprotocolguid) == 0) -static LIST_HEAD(BusInfoList); -static LIST_HEAD(DevInfoList); +static LIST_HEAD(businfolist); +static LIST_HEAD(devinfolist); static VISORCHANNEL *ControlVm_channel; @@ -649,13 +649,13 @@ cleanup_controlvm_structures(void) struct visorchipset_bus_info *bi, *tmp_bi; struct visorchipset_device_info *di, *tmp_di; - list_for_each_entry_safe(bi, tmp_bi, &BusInfoList, entry) { + list_for_each_entry_safe(bi, tmp_bi, &businfolist, entry) { busInfo_clear(bi); list_del(&bi->entry); kfree(bi); } - list_for_each_entry_safe(di, tmp_di, &DevInfoList, entry) { + list_for_each_entry_safe(di, tmp_di, &devinfolist, entry) { devInfo_clear(di); list_del(&di->entry); kfree(di); @@ -836,7 +836,7 @@ bus_responder(enum controlvm_id cmdId, ulong busNo, int response) struct visorchipset_bus_info *p = NULL; BOOL need_clear = FALSE; - p = findbus(&BusInfoList, busNo); + p = findbus(&businfolist, busNo); if (!p) { LOGERR("internal error busNo=%lu", busNo); return; @@ -845,7 +845,7 @@ bus_responder(enum controlvm_id cmdId, ulong busNo, int response) if ((cmdId == CONTROLVM_BUS_CREATE) && (response != (-CONTROLVM_RESP_ERROR_ALREADY_DONE))) /* undo the row we just created... */ - delbusdevices(&DevInfoList, busNo); + delbusdevices(&devinfolist, busNo); } else { if (cmdId == CONTROLVM_BUS_CREATE) p->state.created = 1; @@ -865,7 +865,7 @@ bus_responder(enum controlvm_id cmdId, ulong busNo, int response) p->pending_msg_hdr.id = CONTROLVM_INVALID; if (need_clear) { busInfo_clear(p); - delbusdevices(&DevInfoList, busNo); + delbusdevices(&devinfolist, busNo); } } @@ -877,7 +877,7 @@ device_changestate_responder(enum controlvm_id cmdId, struct visorchipset_device_info *p = NULL; struct controlvm_message outmsg; - p = finddevice(&DevInfoList, busNo, devNo); + p = finddevice(&devinfolist, busNo, devNo); if (!p) { LOGERR("internal error; busNo=%lu, devNo=%lu", busNo, devNo); return; @@ -913,7 +913,7 @@ device_responder(enum controlvm_id cmdId, ulong busNo, ulong devNo, struct visorchipset_device_info *p = NULL; BOOL need_clear = FALSE; - p = finddevice(&DevInfoList, busNo, devNo); + p = finddevice(&devinfolist, busNo, devNo); if (!p) { LOGERR("internal error; busNo=%lu, devNo=%lu", busNo, devNo); return; @@ -946,7 +946,7 @@ bus_epilog(u32 busNo, { BOOL notified = FALSE; - struct visorchipset_bus_info *pBusInfo = findbus(&BusInfoList, busNo); + struct visorchipset_bus_info *pBusInfo = findbus(&businfolist, busNo); if (!pBusInfo) { LOGERR("HUH? bad busNo=%d", busNo); @@ -1015,7 +1015,7 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd, BOOL notified = FALSE; struct visorchipset_device_info *pDevInfo = - finddevice(&DevInfoList, busNo, devNo); + finddevice(&devinfolist, busNo, devNo); char *envp[] = { "SPARSP_DIAGPOOL_PAUSED_STATE = 1", NULL @@ -1113,7 +1113,7 @@ bus_create(struct controlvm_message *inmsg) int rc = CONTROLVM_RESP_SUCCESS; struct visorchipset_bus_info *pBusInfo = NULL; - pBusInfo = findbus(&BusInfoList, busNo); + pBusInfo = findbus(&businfolist, busNo); if (pBusInfo && (pBusInfo->state.created == 1)) { LOGERR("CONTROLVM_BUS_CREATE Failed: bus %lu already exists", busNo); @@ -1150,7 +1150,7 @@ bus_create(struct controlvm_message *inmsg) cmd->create_bus.bus_data_type_uuid; pBusInfo->chan_info.channel_inst_uuid = cmd->create_bus.bus_inst_uuid; - list_add(&pBusInfo->entry, &BusInfoList); + list_add(&pBusInfo->entry, &businfolist); POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, busNo, POSTCODE_SEVERITY_INFO); @@ -1167,7 +1167,7 @@ bus_destroy(struct controlvm_message *inmsg) struct visorchipset_bus_info *pBusInfo; int rc = CONTROLVM_RESP_SUCCESS; - pBusInfo = findbus(&BusInfoList, busNo); + pBusInfo = findbus(&businfolist, busNo); if (!pBusInfo) { LOGERR("CONTROLVM_BUS_DESTROY Failed: bus %lu invalid", busNo); rc = -CONTROLVM_RESP_ERROR_BUS_INVALID; @@ -1197,7 +1197,7 @@ bus_configure(struct controlvm_message *inmsg, PARSER_CONTEXT *parser_ctx) busNo = cmd->configure_bus.bus_no; POSTCODE_LINUX_3(BUS_CONFIGURE_ENTRY_PC, busNo, POSTCODE_SEVERITY_INFO); - pBusInfo = findbus(&BusInfoList, busNo); + pBusInfo = findbus(&businfolist, busNo); if (!pBusInfo) { LOGERR("CONTROLVM_BUS_CONFIGURE Failed: bus %lu invalid", busNo); @@ -1246,7 +1246,7 @@ my_device_create(struct controlvm_message *inmsg) struct visorchipset_bus_info *pBusInfo = NULL; int rc = CONTROLVM_RESP_SUCCESS; - pDevInfo = finddevice(&DevInfoList, busNo, devNo); + pDevInfo = finddevice(&devinfolist, busNo, devNo); if (pDevInfo && (pDevInfo->state.created == 1)) { LOGERR("CONTROLVM_DEVICE_CREATE Failed: busNo=%lu, devNo=%lu already exists", busNo, devNo); @@ -1255,7 +1255,7 @@ my_device_create(struct controlvm_message *inmsg) rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE; goto Away; } - pBusInfo = findbus(&BusInfoList, busNo); + pBusInfo = findbus(&businfolist, busNo); if (!pBusInfo) { LOGERR("CONTROLVM_DEVICE_CREATE Failed: Invalid bus %lu - out of range", busNo); @@ -1298,7 +1298,7 @@ my_device_create(struct controlvm_message *inmsg) pDevInfo->chan_info.channel_type_uuid = cmd->create_device.data_type_uuid; pDevInfo->chan_info.intr = cmd->create_device.intr; - list_add(&pDevInfo->entry, &DevInfoList); + list_add(&pDevInfo->entry, &devinfolist); POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, devNo, busNo, POSTCODE_SEVERITY_INFO); Away: @@ -1326,7 +1326,7 @@ my_device_changestate(struct controlvm_message *inmsg) struct visorchipset_device_info *pDevInfo = NULL; int rc = CONTROLVM_RESP_SUCCESS; - pDevInfo = finddevice(&DevInfoList, busNo, devNo); + pDevInfo = finddevice(&devinfolist, busNo, devNo); if (!pDevInfo) { LOGERR("CONTROLVM_DEVICE_CHANGESTATE Failed: busNo=%lu, devNo=%lu invalid (doesn't exist)", busNo, devNo); @@ -1360,7 +1360,7 @@ my_device_destroy(struct controlvm_message *inmsg) struct visorchipset_device_info *pDevInfo = NULL; int rc = CONTROLVM_RESP_SUCCESS; - pDevInfo = finddevice(&DevInfoList, busNo, devNo); + pDevInfo = finddevice(&devinfolist, busNo, devNo); if (!pDevInfo) { LOGERR("CONTROLVM_DEVICE_DESTROY Failed: busNo=%lu, devNo=%lu invalid", busNo, devNo); @@ -2210,7 +2210,7 @@ device_resume_response(ulong busNo, ulong devNo, int response) BOOL visorchipset_get_bus_info(ulong bus_no, struct visorchipset_bus_info *bus_info) { - void *p = findbus(&BusInfoList, bus_no); + void *p = findbus(&businfolist, bus_no); if (!p) { LOGERR("(%lu) failed", bus_no); @@ -2224,7 +2224,7 @@ EXPORT_SYMBOL_GPL(visorchipset_get_bus_info); BOOL visorchipset_set_bus_context(ulong bus_no, void *context) { - struct visorchipset_bus_info *p = findbus(&BusInfoList, bus_no); + struct visorchipset_bus_info *p = findbus(&businfolist, bus_no); if (!p) { LOGERR("(%lu) failed", bus_no); @@ -2239,7 +2239,7 @@ BOOL visorchipset_get_device_info(ulong bus_no, ulong dev_no, struct visorchipset_device_info *dev_info) { - void *p = finddevice(&DevInfoList, bus_no, dev_no); + void *p = finddevice(&devinfolist, bus_no, dev_no); if (!p) { LOGERR("(%lu,%lu) failed", bus_no, dev_no); @@ -2254,7 +2254,7 @@ BOOL visorchipset_set_device_context(ulong bus_no, ulong dev_no, void *context) { struct visorchipset_device_info *p = - finddevice(&DevInfoList, bus_no, dev_no); + finddevice(&devinfolist, bus_no, dev_no); if (!p) { LOGERR("(%lu,%lu) failed", bus_no, dev_no); -- 1.8.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel