OSDN Git Service

staging: unisys: Fix "else not useful after return" warning in virthba.c
authorKen Depro <kenneth.depro@unisys.com>
Tue, 20 Jan 2015 15:01:13 +0000 (10:01 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Jan 2015 11:59:17 +0000 (19:59 +0800)
This patch fixes a warning generated during the checkpatch script that stated
"else not useful after return".  I modified the code to return a designated
status at the end of the function, and replaced the return statement in the
"else if" to set the status accordingly.

Signed-off-by: Ken Depro <kenneth.depro@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/virthba/virthba.c

index 55017f5..30c62fb 100644 (file)
@@ -1584,6 +1584,8 @@ virthba_serverdown_complete(struct work_struct *work)
 static int
 virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state)
 {
+       int stat = 1;
+
        struct virthba_info *virthbainfo =
            (struct virthba_info *)((struct Scsi_Host *)virtpcidev->scsi.
                                     scsihost)->hostdata;
@@ -1598,11 +1600,12 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state)
                           &virthbainfo->serverdown_completion);
        } else if (virthbainfo->serverchangingstate) {
                LOGERR("Server already processing change state message\n");
-               return 0;
-       } else
+               stat = 0;
+       } else {
                LOGERR("Server already down, but another server down message received.");
+       }
 
-       return 1;
+       return stat;
 }
 
 /*****************************************************/