summaryrefslogtreecommitdiff
path: root/drivers/staging/unisys
diff options
context:
space:
mode:
authorKen Depro <kenneth.depro@unisys.com>2015-01-20 10:01:13 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-25 19:59:17 +0800
commit20078e4859dc0776c7e76c97adaebcf15a0f98de (patch)
treedb37a7b26e4df59f71372cfc3c66a3f63fadf195 /drivers/staging/unisys
parent1cc598c75b72174d125ea2a7568cd231ba9fed27 (diff)
staging: unisys: Fix "else not useful after return" warning in virthba.c
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>
Diffstat (limited to 'drivers/staging/unisys')
-rw-r--r--drivers/staging/unisys/virthba/virthba.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index 55017f5dab38..30c62fb3c60d 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -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;
}
/*****************************************************/