|
Daniel Wagner |
2535a9 |
From: Jason Yan <yanaijie@huawei.com>
|
|
Daniel Wagner |
2535a9 |
Date: Wed, 29 Apr 2020 22:09:52 +0800
|
|
Daniel Wagner |
2535a9 |
Subject: scsi: qla2xxx: Make qla_set_ini_mode() return void
|
|
Daniel Wagner |
2535a9 |
Patch-mainline: v5.8-rc1
|
|
Daniel Wagner |
2535a9 |
Git-commit: 1b007f96f9e063f9f0b93597a4089114a89c1854
|
|
Daniel Wagner |
2535a9 |
References: bsc#1171688 bsc#1174003
|
|
Daniel Wagner |
2535a9 |
|
|
Daniel Wagner |
2535a9 |
The return value is not used by the caller and the local variable 'rc' is
|
|
Daniel Wagner |
2535a9 |
not needed. Make qla_set_ini_mode() return void and remove 'rc'. This also
|
|
Daniel Wagner |
2535a9 |
fixes the following coccicheck warning:
|
|
Daniel Wagner |
2535a9 |
|
|
Daniel Wagner |
2535a9 |
drivers/scsi/qla2xxx/qla_attr.c:1906:5-7: Unneeded variable: "rc".
|
|
Daniel Wagner |
2535a9 |
Return "0" on line 2180
|
|
Daniel Wagner |
2535a9 |
|
|
Daniel Wagner |
2535a9 |
Link: https://lore.kernel.org/r/20200429140952.8240-1-yanaijie@huawei.com
|
|
Daniel Wagner |
2535a9 |
Signed-off-by: Jason Yan <yanaijie@huawei.com>
|
|
Daniel Wagner |
2535a9 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Daniel Wagner |
2535a9 |
Acked-by: Daniel Wagner <dwagner@suse.de>
|
|
Daniel Wagner |
2535a9 |
---
|
|
Daniel Wagner |
2535a9 |
drivers/scsi/qla2xxx/qla_attr.c | 5 +----
|
|
Daniel Wagner |
2535a9 |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
Daniel Wagner |
2535a9 |
|
|
Daniel Wagner |
2535a9 |
--- a/drivers/scsi/qla2xxx/qla_attr.c
|
|
Daniel Wagner |
2535a9 |
+++ b/drivers/scsi/qla2xxx/qla_attr.c
|
|
Daniel Wagner |
2535a9 |
@@ -1922,9 +1922,8 @@ static char *mode_to_str[] = {
|
|
Daniel Wagner |
2535a9 |
};
|
|
Daniel Wagner |
2535a9 |
|
|
Daniel Wagner |
2535a9 |
#define NEED_EXCH_OFFLOAD(_exchg) ((_exchg) > FW_DEF_EXCHANGES_CNT)
|
|
Daniel Wagner |
2535a9 |
-static int qla_set_ini_mode(scsi_qla_host_t *vha, int op)
|
|
Daniel Wagner |
2535a9 |
+static void qla_set_ini_mode(scsi_qla_host_t *vha, int op)
|
|
Daniel Wagner |
2535a9 |
{
|
|
Daniel Wagner |
2535a9 |
- int rc = 0;
|
|
Daniel Wagner |
2535a9 |
enum {
|
|
Daniel Wagner |
2535a9 |
NO_ACTION,
|
|
Daniel Wagner |
2535a9 |
MODE_CHANGE_ACCEPT,
|
|
Daniel Wagner |
2535a9 |
@@ -2197,8 +2196,6 @@ static int qla_set_ini_mode(scsi_qla_hos
|
|
Daniel Wagner |
2535a9 |
vha->ql2xexchoffld, vha->u_ql2xexchoffld);
|
|
Daniel Wagner |
2535a9 |
break;
|
|
Daniel Wagner |
2535a9 |
}
|
|
Daniel Wagner |
2535a9 |
-
|
|
Daniel Wagner |
2535a9 |
- return rc;
|
|
Daniel Wagner |
2535a9 |
}
|
|
Daniel Wagner |
2535a9 |
|
|
Daniel Wagner |
2535a9 |
static ssize_t
|