From: Ken Depro Date: Tue, 20 Jan 2015 15:01:13 +0000 (-0500) Subject: staging: unisys: Fix "else not useful after return" warning in virthba.c X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=20078e4859dc0776c7e76c97adaebcf15a0f98de;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- 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; } /*****************************************************/