Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5512e523 authored by Himanshu Madhani's avatar Himanshu Madhani Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Remove stale ADISC_DONE event 



Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent aecf0434

drivers/scsi/qla2xxx/qla_def.h

+0 −1
Original line number Diff line number Diff line
@@ -3214,7 +3214,6 @@ enum qla_work_type { 
	QLA_EVT_ASYNC_LOGOUT,

	QLA_EVT_ASYNC_LOGOUT_DONE,

	QLA_EVT_ASYNC_ADISC,

	QLA_EVT_ASYNC_ADISC_DONE,

	QLA_EVT_UEVENT,

	QLA_EVT_AENFX,

	QLA_EVT_GPNID,

drivers/scsi/qla2xxx/qla_gbl.h

+0 −2
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ 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 *);

extern void qla2x00_async_adisc_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 *);

drivers/scsi/qla2xxx/qla_init.c

+0 −20
Original line number Diff line number Diff line
@@ -2075,26 +2075,6 @@ qla2x00_async_logout_done(struct scsi_qla_host *vha, fc_port_t *fcport, 
	return;

}



void

qla2x00_async_adisc_done(struct scsi_qla_host *vha, fc_port_t *fcport,

    uint16_t *data)

{

	fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);

	if (data[0] == MBS_COMMAND_COMPLETE) {

		qla2x00_update_fcport(vha, fcport);



		return;

	}



	/* Retry login. */

	if (data[1] & QLA_LOGIO_LOGIN_RETRIED)

		set_bit(RELOGIN_NEEDED, &vha->dpc_flags);

	else

		qla2x00_mark_device_lost(vha, fcport, 1, 0);



	return;

}



/****************************************************************************/

/*                QLogic ISP2x00 Hardware Support Functions.                */

/****************************************************************************/

drivers/scsi/qla2xxx/qla_os.c

+0 −5
Original line number Diff line number Diff line
@@ -4733,7 +4733,6 @@ 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(adisc_done, QLA_EVT_ASYNC_ADISC_DONE);

qla2x00_post_async_work(prlo, QLA_EVT_ASYNC_PRLO);

qla2x00_post_async_work(prlo_done, QLA_EVT_ASYNC_PRLO_DONE);
@@ -5022,10 +5021,6 @@ qla2x00_do_work(struct scsi_qla_host *vha) 
			qla2x00_async_adisc(vha, e->u.logio.fcport,

			    e->u.logio.data);

			break;

		case QLA_EVT_ASYNC_ADISC_DONE:

			qla2x00_async_adisc_done(vha, e->u.logio.fcport,

			    e->u.logio.data);

			break;

		case QLA_EVT_UEVENT:

			qla2x00_uevent_emit(vha, e->u.uevent.code);

			break;