staging: unisys: uislib: uislib.c: sparse warning of context imbalance
PATCH 1/1 staging: unisys: uislib: uislib.c: sparse warning of context imbalance
fixed sparse warning : context imbalance in 'resume_device'
unexpected unlock
this patch will generate warning from checkpatch for lines over 80 character , but since those are user-visible strings so it was not modified.
--- drivers/staging/unisys/uislib/uislib.c | 81 ++++++++++++++++------------------ 1 file changed, 39 insertions(+), 42 deletions(-)
drivers/staging/unisys/uislib/uislib.c +39 -42
@@ -616,6 +616,7 @@ resume_device(CONTROLVM_MESSAGE *msg)struct bus_info *bus;struct device_info *dev;struct guest_msgs cmd; +int retval =CONTROLVM_RESP_SUCCESS ; busNo = msg->cmd.deviceChangeState.busNo; devNo = msg->cmd.deviceChangeState.devNo;
@@ -627,45 +628,16 @@ resume_device(CONTROLVM_MESSAGE *msg)if (devNo >= bus->deviceCount) {LOGERR ("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: device(%d) >= deviceCount(%d)." , devNo, bus->deviceCount); -read_unlock (&BusListLock); -return CONTROLVM_RESP_ERROR_DEVICE_INVALID ; - } -/* make sure this device exists */ - dev = bus->device[devNo]; -if (!dev) { -LOGERR ("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: device %d does not exist." , - devNo); -read_unlock (&BusListLock); -return CONTROLVM_RESP_ERROR_ALREADY_DONE ; - } -read_unlock (&BusListLock); -/* the msg is bound for virtpci; send -* guest_msgs struct to callback -*/ -if (!uuid_le_cmp (dev->channelTypeGuid, - UltraVhbaChannelProtocolGuid)) { - cmd.msgtype =GUEST_RESUME_VHBA ; - cmd.resume_vhba.chanptr = dev->chanptr; - }else -if (!uuid_le_cmp (dev->channelTypeGuid, - UltraVnicChannelProtocolGuid)) { - cmd.msgtype =GUEST_RESUME_VNIC ; - cmd.resume_vnic.chanptr = dev->chanptr; + retval =CONTROLVM_RESP_ERROR_DEVICE_INVALID ; }else { -LOGERR ("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: unknown channelTypeGuid.\n" ); -return -CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN ; - } - -if (!VirtControlChanFunc) { -LOGERR ("CONTROLVM_DEVICE_CHANGESTATE Failed: virtpci callback not registered." ); -return -CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE ; - } - -if (!VirtControlChanFunc (&cmd)) { -LOGERR ("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: virtpci GUEST_RESUME_[VHBA||VNIC] returned error." ); -return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR ; +/* make sure this device exists */ + dev = bus->device[devNo]; +if (!dev) { +LOGERR ("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: device %d does not exist." , + devNo); + retval = +CONTROLVM_RESP_ERROR_ALREADY_DONE ; + } }break ; }
@@ -674,11 +646,36 @@ resume_device(CONTROLVM_MESSAGE *msg)if (!bus) {LOGERR ("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: bus %d does not exist" , busNo); -read_unlock (&BusListLock); -return CONTROLVM_RESP_ERROR_BUS_INVALID ; + retval =CONTROLVM_RESP_ERROR_BUS_INVALID ; } - -return CONTROLVM_RESP_SUCCESS ; +read_unlock (&BusListLock); +/* the msg is bound for virtpci; send +* guest_msgs struct to callback +*/ +if (retval ==CONTROLVM_RESP_SUCCESS ) { +if (!uuid_le_cmp (dev->channelTypeGuid, + UltraVhbaChannelProtocolGuid)) { + cmd.msgtype =GUEST_RESUME_VHBA ; + cmd.resume_vhba.chanptr = dev->chanptr; + }else if (!uuid_le_cmp (dev->channelTypeGuid, + UltraVnicChannelProtocolGuid)) { + cmd.msgtype =GUEST_RESUME_VNIC ; + cmd.resume_vnic.chanptr = dev->chanptr; + }else { +LOGERR ("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: unknown channelTypeGuid.\n" ); +return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN ; + } +if (!VirtControlChanFunc) { +LOGERR ("CONTROLVM_DEVICE_CHANGESTATE Failed: virtpci callback not registered." ); +return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE ; + } +if (!VirtControlChanFunc (&cmd)) { +LOGERR ("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: virtpci GUEST_RESUME_[VHBA||VNIC] returned error." ); +return +CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR ; + } + } +return retval; } static int
Signature · 1 line
1.8.1.2
Quoted 7 lines · Sudip Mukherjee
fixed sparse warning : context imbalance in '
resume_device'
unexpected unlock
this patch will generate warning from checkpatch for lines over 80 character , but since those are user-visible strings so it was not modified.Signed-off-by Sudip Mukherjee <[email protected]>
I tested your changes, and this patch works fine. Thanks!
-- Ben
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Quoted 7 lines · Benjamin M
Quoted 6 lines · Sudip Mukherjee
fixed sparse warning : context imbalance in '
resume_device'
unexpected unlock
this patch will generate warning from checkpatch for lines over 80 character , but since those are user-visible strings so it was not modified.
Quoted 8 lines
Quoted 1 line
Signed-off-by Sudip Mukherjee <[email protected]>I tested your changes, and this patch works fine. Thanks!
-- Ben
Acked-by Benjamin Romer <[email protected]>Tested-by Benjamin Romer <[email protected]>
thanks,
so after Greg K-H applies it then the patch to remove the last warning from this file.
thanks
sudip