From: Jeffrey <Jeffrey.Brown@xxxxxxxxxx> Fixed the camel cases in the static void setup_crash_devices_work_ queue localCrashCreateBusMsg -> localcrashcreatebusmsg localCrashCreateDevMsg -> localcrashcreatedevmsg localSavedCrashMsgOffset -> localsavedcrashmsgoffset localSavedCrashMsgCount -> localsavedcrashmsgcount Away -> cleanups Signed-off-by: Jeffrey Brown <Jeffrey.Brown@xxxxxxxxxx> --- .../unisys/visorchipset/visorchipset_main.c | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index 7e3cd3f..1d9aaca 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -2056,21 +2056,21 @@ cleanups: static void setup_crash_devices_work_queue(struct work_struct *work) { - struct controlvm_message localCrashCreateBusMsg; - struct controlvm_message localCrashCreateDevMsg; + struct controlvm_message localcrashcreatebusmsg; + struct controlvm_message localcrashcreatedevmsg; struct controlvm_message msg; - u32 localSavedCrashMsgOffset; - u16 localSavedCrashMsgCount; + u32 localsavedcrashmsgoffset; + u16 localsavedcrashmsgcount; /* make sure visorbus server is registered for controlvm callbacks */ if (visorchipset_serverregwait && !serverregistered) - goto Away; + goto cleanups; /* make sure visorclientbus server is regsitered for controlvm * callbacks */ if (visorchipset_clientregwait && !clientregistered) - goto Away; + goto cleanups; POSTCODE_LINUX_2(CRASH_DEV_ENTRY_PC, POSTCODE_SEVERITY_INFO); @@ -2085,18 +2085,18 @@ setup_crash_devices_work_queue(struct work_struct *work) if (visorchannel_read(controlvm_channel, offsetof(struct spar_controlvm_channel_protocol, saved_crash_message_count), - &localSavedCrashMsgCount, sizeof(u16)) < 0) { + &localsavedcrashmsgcount, sizeof(u16)) < 0) { LOGERR("failed to get Saved Message Count"); POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC, POSTCODE_SEVERITY_ERR); return; } - if (localSavedCrashMsgCount != CONTROLVM_CRASHMSG_MAX) { + if (localsavedcrashmsgcount != CONTROLVM_CRASHMSG_MAX) { LOGERR("Saved Message Count incorrect %d", - localSavedCrashMsgCount); + localsavedcrashmsgcount); POSTCODE_LINUX_3(CRASH_DEV_COUNT_FAILURE_PC, - localSavedCrashMsgCount, + localsavedcrashmsgcount, POSTCODE_SEVERITY_ERR); return; } @@ -2105,7 +2105,7 @@ setup_crash_devices_work_queue(struct work_struct *work) if (visorchannel_read(controlvm_channel, offsetof(struct spar_controlvm_channel_protocol, saved_crash_message_offset), - &localSavedCrashMsgOffset, sizeof(u32)) < 0) { + &localsavedcrashmsgoffset, sizeof(u32)) < 0) { LOGERR("failed to get Saved Message Offset"); POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC, POSTCODE_SEVERITY_ERR); @@ -2114,8 +2114,8 @@ setup_crash_devices_work_queue(struct work_struct *work) /* read create device message for storage bus offset */ if (visorchannel_read(controlvm_channel, - localSavedCrashMsgOffset, - &localCrashCreateBusMsg, + localsavedcrashmsgoffset, + &localcrashcreatebusmsg, sizeof(struct controlvm_message)) < 0) { LOGERR("CRASH_DEV_RD_BUS_FAIULRE: Failed to read CrashCreateBusMsg!"); POSTCODE_LINUX_2(CRASH_DEV_RD_BUS_FAIULRE_PC, @@ -2125,9 +2125,9 @@ setup_crash_devices_work_queue(struct work_struct *work) /* read create device message for storage device */ if (visorchannel_read(controlvm_channel, - localSavedCrashMsgOffset + + localsavedcrashmsgoffset + sizeof(struct controlvm_message), - &localCrashCreateDevMsg, + &localcrashcreatedevmsg, sizeof(struct controlvm_message)) < 0) { LOGERR("CRASH_DEV_RD_DEV_FAIULRE: Failed to read CrashCreateDevMsg!"); POSTCODE_LINUX_2(CRASH_DEV_RD_DEV_FAIULRE_PC, @@ -2136,8 +2136,8 @@ setup_crash_devices_work_queue(struct work_struct *work) } /* reuse IOVM create bus message */ - if (localCrashCreateBusMsg.cmd.create_bus.channel_addr != 0) { - bus_create(&localCrashCreateBusMsg); + if (localcrashcreatebusmsg.cmd.create_bus.channel_addr != 0) { + bus_create(&localcrashcreatebusmsg); } else { LOGERR("CrashCreateBusMsg is null, no dump will be taken"); POSTCODE_LINUX_2(CRASH_DEV_BUS_NULL_FAILURE_PC, @@ -2146,8 +2146,8 @@ setup_crash_devices_work_queue(struct work_struct *work) } /* reuse create device message for storage device */ - if (localCrashCreateDevMsg.cmd.create_device.channel_addr != 0) { - my_device_create(&localCrashCreateDevMsg); + if (localcrashcreatedevmsg.cmd.create_device.channel_addr != 0) { + my_device_create(&localcrashcreatedevmsg); } else { LOGERR("CrashCreateDevMsg is null, no dump will be taken"); POSTCODE_LINUX_2(CRASH_DEV_DEV_NULL_FAILURE_PC, @@ -2158,7 +2158,7 @@ setup_crash_devices_work_queue(struct work_struct *work) POSTCODE_LINUX_2(CRASH_DEV_EXIT_PC, POSTCODE_SEVERITY_INFO); return; -Away: +cleanups: poll_jiffies = POLLJIFFIES_CONTROLVMCHANNEL_SLOW; -- 1.8.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel