From: Jeffrey <jeffrey.br...@unisys.com>

Fixed all logical continuations by moving the operators to their
correct lines, (which is the line previous to the operator)

Signed-off-by: Jeffrey Brown <jeffrey.br...@unisys.com>
---
 .../unisys/visorchipset/visorchipset_main.c        | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c 
b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 73cd0a3..eaa7a8a 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -91,8 +91,8 @@ static struct controlvm_message_packet 
g_DeviceChangeStatePacket;
  */
 #define FOR_VISORHACKBUS(channel_type_guid) \
        (((uuid_le_cmp(channel_type_guid,\
-                      spar_vnic_channel_protocol_uuid) == 0)\
-       || (uuid_le_cmp(channel_type_guid,\
+                      spar_vnic_channel_protocol_uuid) == 0) ||\
+          (uuid_le_cmp(channel_type_guid,\
                        spar_vhba_channel_protocol_uuid) == 0)))
 #define FOR_VISORBUS(channel_type_guid) 
(!(FOR_VISORHACKBUS(channel_type_guid)))
 
@@ -719,10 +719,10 @@ controlvm_respond(struct controlvm_message_header 
*msgHdr, int response)
        controlvm_init_response(&outmsg, msgHdr, response);
        /* For DiagPool channel DEVICE_CHANGESTATE, we need to send
        * back the deviceChangeState structure in the packet. */
-       if (msgHdr->id == CONTROLVM_DEVICE_CHANGESTATE
-           && g_DeviceChangeStatePacket.device_change_state.bus_no ==
-           g_diagpoolBusNo
-           && g_DeviceChangeStatePacket.device_change_state.dev_no ==
+       if (msgHdr->id == CONTROLVM_DEVICE_CHANGESTATE &&
+           g_DeviceChangeStatePacket.device_change_state.bus_no ==
+           g_diagpoolBusNo &&
+           g_DeviceChangeStatePacket.device_change_state.dev_no ==
            g_diagpoolDevNo)
                outmsg.cmd = g_DeviceChangeStatePacket;
        if (outmsg.hdr.flags.test_message == 1) {
@@ -1074,8 +1074,8 @@ device_epilog(u32 busNo, u32 devNo, struct 
spar_segment_state state, u32 cmd,
                                /* this is lite pause where channel is
                                 * still valid just 'pause' of it
                                 */
-                               if (busNo == g_diagpoolBusNo
-                                   && devNo == g_diagpoolDevNo) {
+                               if (busNo == g_diagpoolBusNo &&
+                                   devNo == g_diagpoolDevNo) {
                                        
LOGINF("DEVICE_CHANGESTATE(DiagpoolChannel busNo=%d devNo=%d is pausing...)",
                                               busNo, devNo);
                                        /* this will trigger the
@@ -1838,8 +1838,7 @@ handle_command(struct controlvm_message inmsg, 
HOSTADDRESS channel_addr)
        if (!isLocalAddr) {
                controlvm_init_response(&ackmsg, &inmsg.hdr,
                                        CONTROLVM_RESP_SUCCESS);
-               if ((ControlVm_channel)
-                   &&
+               if ((ControlVm_channel) &&
                    (!visorchannel_signalinsert
                     (ControlVm_channel, CONTROLVM_QUEUE_ACK, &ackmsg)))
                        LOGWRN("failed to send ACK failed");
@@ -1975,8 +1974,8 @@ controlvm_periodic_work(struct work_struct *work)
        /* Check events to determine if response to CHIPSET_READY
         * should be sent
         */
-       if (visorchipset_holdchipsetready
-           && (g_ChipSetMsgHdr.id != CONTROLVM_INVALID)) {
+       if (visorchipset_holdchipsetready &&
+           (g_ChipSetMsgHdr.id != CONTROLVM_INVALID)) {
                if (check_chipset_events() == 1) {
                        LOGINF("Sending CHIPSET_READY response");
                        controlvm_respond(&g_ChipSetMsgHdr, 0);
-- 
1.8.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to