From bd0d2dcc03db2bffcd4bd292fadc9234006edbfb Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 23 Oct 2014 14:30:13 -0400 Subject: [PATCH] staging: unisys: fix CamelCase constant names in controlframework.h Fix CamelCase names: SegmentStateRunning => segment_state_running SegmentStatePaused => segment_state_paused SegmentStateStandby => segment_state_standby Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../common-spar/include/channels/controlframework.h | 6 +++--- drivers/staging/unisys/uislib/uislib.c | 8 ++++---- .../staging/unisys/visorchipset/visorchipset_main.c | 21 +++++++++++---------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/controlframework.h b/drivers/staging/unisys/common-spar/include/channels/controlframework.h index 9f01f40..80e2df1 100644 --- a/drivers/staging/unisys/common-spar/include/channels/controlframework.h +++ b/drivers/staging/unisys/common-spar/include/channels/controlframework.h @@ -55,15 +55,15 @@ struct spar_segment_state { * which is non-compliant */ }; -static const struct spar_segment_state SegmentStateRunning = { +static const struct spar_segment_state segment_state_running = { 1, 1, 1, 0, 1, 1, 1, 1 }; -static const struct spar_segment_state SegmentStatePaused = { +static const struct spar_segment_state segment_state_paused = { 1, 1, 1, 0, 1, 1, 1, 0 }; -static const struct spar_segment_state SegmentStateStandby = { +static const struct spar_segment_state segment_state_standby = { 1, 1, 0, 0, 1, 1, 1, 0 }; diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c index bcb80ba..a0b1e04 100644 --- a/drivers/staging/unisys/uislib/uislib.c +++ b/drivers/staging/unisys/uislib/uislib.c @@ -891,7 +891,7 @@ uislib_client_inject_pause_vhba(u32 bus_no, u32 dev_no) init_msg_header(&msg, CONTROLVM_DEVICE_CHANGESTATE, 0, 0); msg.cmd.deviceChangeState.busNo = bus_no; msg.cmd.deviceChangeState.devNo = dev_no; - msg.cmd.deviceChangeState.state = SegmentStateStandby; + msg.cmd.deviceChangeState.state = segment_state_standby; rc = pause_device(&msg); if (rc != CONTROLVM_RESP_SUCCESS) { LOGERR("VHBA pause_device failed. busNo=0x%x devNo=0x%x\n", @@ -911,7 +911,7 @@ uislib_client_inject_resume_vhba(u32 bus_no, u32 dev_no) init_msg_header(&msg, CONTROLVM_DEVICE_CHANGESTATE, 0, 0); msg.cmd.deviceChangeState.busNo = bus_no; msg.cmd.deviceChangeState.devNo = dev_no; - msg.cmd.deviceChangeState.state = SegmentStateRunning; + msg.cmd.deviceChangeState.state = segment_state_running; rc = resume_device(&msg); if (rc != CONTROLVM_RESP_SUCCESS) { LOGERR("VHBA resume_device failed. busNo=0x%x devNo=0x%x\n", @@ -1044,7 +1044,7 @@ uislib_client_inject_pause_vnic(u32 bus_no, u32 dev_no) init_msg_header(&msg, CONTROLVM_DEVICE_CHANGESTATE, 0, 0); msg.cmd.deviceChangeState.busNo = bus_no; msg.cmd.deviceChangeState.devNo = dev_no; - msg.cmd.deviceChangeState.state = SegmentStateStandby; + msg.cmd.deviceChangeState.state = segment_state_standby; rc = pause_device(&msg); if (rc != CONTROLVM_RESP_SUCCESS) { LOGERR("VNIC pause_device failed. busNo=0x%x devNo=0x%x\n", @@ -1064,7 +1064,7 @@ uislib_client_inject_resume_vnic(u32 bus_no, u32 dev_no) init_msg_header(&msg, CONTROLVM_DEVICE_CHANGESTATE, 0, 0); msg.cmd.deviceChangeState.busNo = bus_no; msg.cmd.deviceChangeState.devNo = dev_no; - msg.cmd.deviceChangeState.state = SegmentStateRunning; + msg.cmd.deviceChangeState.state = segment_state_running; rc = resume_device(&msg); if (rc != CONTROLVM_RESP_SUCCESS) { LOGERR("VNIC resume_device failed. busNo=0x%x devNo=0x%x\n", diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index 4f27392..f0a4dfa 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -1031,8 +1031,9 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd, break; case CONTROLVM_DEVICE_CHANGESTATE: /* ServerReady / ServerRunning / SegmentStateRunning */ - if (state.alive == SegmentStateRunning.alive && - state.operating == SegmentStateRunning.operating) { + if (state.alive == segment_state_running.alive && + state.operating == + segment_state_running.operating) { if (notifiers->device_resume) { (*notifiers->device_resume) (busNo, devNo); @@ -1040,9 +1041,9 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd, } } /* ServerNotReady / ServerLost / SegmentStateStandby */ - else if (state.alive == SegmentStateStandby.alive && + else if (state.alive == segment_state_standby.alive && state.operating == - SegmentStateStandby.operating) { + segment_state_standby.operating) { /* technically this is standby case * where server is lost */ @@ -1051,9 +1052,9 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd, devNo); notified = TRUE; } - } else if (state.alive == SegmentStatePaused.alive && + } else if (state.alive == segment_state_paused.alive && state.operating == - SegmentStatePaused.operating) { + segment_state_paused.operating) { /* this is lite pause where channel is * still valid just 'pause' of it */ @@ -1292,7 +1293,7 @@ Away: LOGINF("CONTROLVM_DEVICE_CREATE for DiagPool channel: busNo=%lu, devNo=%lu", g_diagpoolBusNo, g_diagpoolDevNo); } - device_epilog(busNo, devNo, SegmentStateRunning, + device_epilog(busNo, devNo, segment_state_running, CONTROLVM_DEVICE_CREATE, &inmsg->hdr, rc, inmsg->hdr.Flags.responseExpected == 1, FOR_VISORBUS(pDevInfo->chanInfo.channelTypeGuid)); @@ -1356,7 +1357,7 @@ my_device_destroy(CONTROLVM_MESSAGE *inmsg) Away: if ((rc >= CONTROLVM_RESP_SUCCESS) && pDevInfo) - device_epilog(busNo, devNo, SegmentStateRunning, + device_epilog(busNo, devNo, segment_state_running, CONTROLVM_DEVICE_DESTROY, &inmsg->hdr, rc, inmsg->hdr.Flags.responseExpected == 1, FOR_VISORBUS(pDevInfo->chanInfo.channelTypeGuid)); @@ -2174,7 +2175,7 @@ visorchipset_device_pause_response(ulong busNo, ulong devNo, int response) device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE, busNo, devNo, response, - SegmentStateStandby); + segment_state_standby); } EXPORT_SYMBOL_GPL(visorchipset_device_pause_response); @@ -2183,7 +2184,7 @@ device_resume_response(ulong busNo, ulong devNo, int response) { device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE, busNo, devNo, response, - SegmentStateRunning); + segment_state_running); } BOOL -- 2.7.4