| Message ID | 1539951177-184754-1-git-send-email-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [-next] scsi: qedf: remove set but not used variable 'fcport' | expand |
On Fri, 2018-10-19 at 12:12 +0000, YueHaibing wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/scsi/qedf/qedf_main.c: In function 'qedf_eh_abort': > drivers/scsi/qedf/qedf_main.c:619:21: warning: > variable 'fcport' set but not used [-Wunused-but-set-variable] > struct qedf_rport *fcport; > > It never used since introduction in > commit 61d8658b4a43 ("scsi: qedf: Add QLogic FastLinQ offload FCoE > driver framework.") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/scsi/qedf/qedf_main.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/scsi/qedf/qedf_main.c > b/drivers/scsi/qedf/qedf_main.c > index d5a4f17..04f50a3 100644 > --- a/drivers/scsi/qedf/qedf_main.c > +++ b/drivers/scsi/qedf/qedf_main.c > @@ -615,8 +615,6 @@ static u32 qedf_get_login_failures(void *cookie) > static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) > { > struct fc_rport *rport = > starget_to_rport(scsi_target(sc_cmd->device)); > - struct fc_rport_libfc_priv *rp = rport->dd_data; > - struct qedf_rport *fcport; > struct fc_lport *lport; > struct qedf_ctx *qedf; > struct qedf_ioreq *io_req; > @@ -636,8 +634,6 @@ static int qedf_eh_abort(struct scsi_cmnd > *sc_cmd) > goto out; > } > > - fcport = (struct qedf_rport *)&rp[1]; > - > io_req = (struct qedf_ioreq *)sc_cmd->SCp.ptr; > if (!io_req) { > QEDF_ERR(&(qedf->dbg_ctx), "io_req is NULL.\n"); > > > Yes, but qedf_eh_host_reset() checks if (fcport == NULL) and returns FAILED and it's not clear that qedf_eh_abort() shouldn't do the same thing, consider that qedf_process_cqe() checks whether io_req->fcport == NULL so it does not seem clear that the io_req->fcport from sc_cmd->SCp.ptr will always be valid later... Can someone from Cavium (Chad) comment? -Ewan
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index d5a4f17..04f50a3 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c @@ -615,8 +615,6 @@ static u32 qedf_get_login_failures(void *cookie) static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) { struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device)); - struct fc_rport_libfc_priv *rp = rport->dd_data; - struct qedf_rport *fcport; struct fc_lport *lport; struct qedf_ctx *qedf; struct qedf_ioreq *io_req; @@ -636,8 +634,6 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) goto out; } - fcport = (struct qedf_rport *)&rp[1]; - io_req = (struct qedf_ioreq *)sc_cmd->SCp.ptr; if (!io_req) { QEDF_ERR(&(qedf->dbg_ctx), "io_req is NULL.\n");
Fixes gcc '-Wunused-but-set-variable' warning: drivers/scsi/qedf/qedf_main.c: In function 'qedf_eh_abort': drivers/scsi/qedf/qedf_main.c:619:21: warning: variable 'fcport' set but not used [-Wunused-but-set-variable] struct qedf_rport *fcport; It never used since introduction in commit 61d8658b4a43 ("scsi: qedf: Add QLogic FastLinQ offload FCoE driver framework.") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/scsi/qedf/qedf_main.c | 4 ---- 1 file changed, 4 deletions(-)