From: Himanshu Madhani <hmadhani@marvell.com>
To: <James.Bottomley@HansenPartnership.com>, <martin.petersen@oracle.com>
Cc: <hmadhani@marvell.com>, <linux-scsi@vger.kernel.org>
Subject: [PATCH 04/14] qla2xxx: Cleanup unused async_logout_done
Date: Tue, 17 Dec 2019 14:06:07 -0800 [thread overview]
Message-ID: <20191217220617.28084-5-hmadhani@marvell.com> (raw)
In-Reply-To: <20191217220617.28084-1-hmadhani@marvell.com>
From: Shyam Sundar <ssundar@marvell.com>
This patch removes unused qla2x00_async_logout_done
from the code.
Signed-off-by: Shyam Sundar <ssundar@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
drivers/scsi/qla2xxx/qla_def.h | 1 -
drivers/scsi/qla2xxx/qla_gbl.h | 4 ----
drivers/scsi/qla2xxx/qla_init.c | 10 ----------
drivers/scsi/qla2xxx/qla_os.c | 5 -----
4 files changed, 20 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 81362517b404..3b9ecdeecc8e 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -3277,7 +3277,6 @@ enum qla_work_type {
QLA_EVT_IDC_ACK,
QLA_EVT_ASYNC_LOGIN,
QLA_EVT_ASYNC_LOGOUT,
- QLA_EVT_ASYNC_LOGOUT_DONE,
QLA_EVT_ASYNC_ADISC,
QLA_EVT_UEVENT,
QLA_EVT_AENFX,
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 5098bb96aa2c..dec295f077d2 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -72,8 +72,6 @@ extern int qla2x00_async_adisc(struct scsi_qla_host *, fc_port_t *,
extern int qla2x00_async_tm_cmd(fc_port_t *, uint32_t, uint32_t, uint32_t);
extern void qla2x00_async_login_done(struct scsi_qla_host *, fc_port_t *,
uint16_t *);
-extern void qla2x00_async_logout_done(struct scsi_qla_host *, fc_port_t *,
- uint16_t *);
struct qla_work_evt *qla2x00_alloc_work(struct scsi_qla_host *,
enum qla_work_type);
extern int qla24xx_async_gnl(struct scsi_qla_host *, fc_port_t *);
@@ -183,8 +181,6 @@ extern int qla2x00_post_async_login_work(struct scsi_qla_host *, fc_port_t *,
uint16_t *);
extern int qla2x00_post_async_logout_work(struct scsi_qla_host *, fc_port_t *,
uint16_t *);
-extern int qla2x00_post_async_logout_done_work(struct scsi_qla_host *,
- fc_port_t *, uint16_t *);
extern int qla2x00_post_async_adisc_work(struct scsi_qla_host *, fc_port_t *,
uint16_t *);
extern int qla2x00_post_async_adisc_done_work(struct scsi_qla_host *,
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 73de5ada9bc9..f71c31350f1b 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2059,16 +2059,6 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
return;
}
-void
-qla2x00_async_logout_done(struct scsi_qla_host *vha, fc_port_t *fcport,
- uint16_t *data)
-{
- qlt_logo_completion_handler(fcport, data[0]);
- fcport->login_gen++;
- fcport->flags &= ~FCF_ASYNC_ACTIVE;
- return;
-}
-
/****************************************************************************/
/* QLogic ISP2x00 Hardware Support Functions. */
/****************************************************************************/
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 6b6fabed99e2..ec1637e09f94 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4942,7 +4942,6 @@ int qla2x00_post_async_##name##_work( \
qla2x00_post_async_work(login, QLA_EVT_ASYNC_LOGIN);
qla2x00_post_async_work(logout, QLA_EVT_ASYNC_LOGOUT);
-qla2x00_post_async_work(logout_done, QLA_EVT_ASYNC_LOGOUT_DONE);
qla2x00_post_async_work(adisc, QLA_EVT_ASYNC_ADISC);
qla2x00_post_async_work(prlo, QLA_EVT_ASYNC_PRLO);
qla2x00_post_async_work(prlo_done, QLA_EVT_ASYNC_PRLO_DONE);
@@ -5230,10 +5229,6 @@ qla2x00_do_work(struct scsi_qla_host *vha)
case QLA_EVT_ASYNC_LOGOUT:
rc = qla2x00_async_logout(vha, e->u.logio.fcport);
break;
- case QLA_EVT_ASYNC_LOGOUT_DONE:
- qla2x00_async_logout_done(vha, e->u.logio.fcport,
- e->u.logio.data);
- break;
case QLA_EVT_ASYNC_ADISC:
qla2x00_async_adisc(vha, e->u.logio.fcport,
e->u.logio.data);
--
2.12.0
next prev parent reply other threads:[~2019-12-17 22:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 22:06 [PATCH 00/14] qla2xxx: Fixes for the driver Himanshu Madhani
2019-12-17 22:06 ` [PATCH 01/14] qla2xxx: Remove defer flag to indicate immeadiate port loss Himanshu Madhani
2019-12-17 22:06 ` [PATCH 02/14] qla2xxx: Fix fabric scan hang Himanshu Madhani
2019-12-17 22:06 ` [PATCH 03/14] qla2xxx: Add a shadow variable to hold disc_state history of fcport Himanshu Madhani
2019-12-17 22:06 ` Himanshu Madhani [this message]
2019-12-17 22:06 ` [PATCH 05/14] qla2xxx: Fix update_fcport for current_topology Himanshu Madhani
2019-12-17 22:06 ` [PATCH 06/14] qla2xxx: Add D-Port Diagnostic reason explanation logs Himanshu Madhani
2019-12-17 22:06 ` [PATCH 07/14] qla2xxx: Use common routine to free fcport struct Himanshu Madhani
2019-12-17 22:06 ` [PATCH 08/14] qla2xxx: Fix stuck login session using prli_pend_timer Himanshu Madhani
2019-12-17 22:06 ` [PATCH 09/14] qla2xxx: Correct fcport flags handling Himanshu Madhani
2019-12-17 22:06 ` [PATCH 10/14] qla2xxx: Consolidate fabric scan Himanshu Madhani
2019-12-17 22:06 ` [PATCH 11/14] qla2xxx: Fix RIDA Format-2 Himanshu Madhani
2019-12-17 22:06 ` [PATCH 12/14] qla2xxx: Fix stuck session in GNL Himanshu Madhani
2019-12-17 22:06 ` [PATCH 13/14] qla2xxx: Fix mtcp dump collection failure Himanshu Madhani
2019-12-17 22:06 ` [PATCH 14/14] qla2xxx: Update driver version to 10.01.00.22-k Himanshu Madhani
2019-12-20 3:36 ` [PATCH 00/14] qla2xxx: Fixes for the driver Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191217220617.28084-5-hmadhani@marvell.com \
--to=hmadhani@marvell.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).