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

Commit 1956eee5 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Make qla24xx_async_abort_cmd() static 



Since qla24xx_async_abort_cmd() is only called from inside qla_init.c,
declare that function static. Reorder a few functions to avoid that any
forward declarations are needed.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1b1e68d2

drivers/scsi/qla2xxx/qla_gbl.h

+0 −1
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ extern void qla24xx_sched_upd_fcport(fc_port_t *); 
void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *,

	uint16_t *);

int qla24xx_post_gnl_work(struct scsi_qla_host *, fc_port_t *);

int qla24xx_async_abort_cmd(srb_t *, bool);

int qla24xx_post_relogin_work(struct scsi_qla_host *vha);

void qla2x00_wait_for_sess_deletion(scsi_qla_host_t *);

drivers/scsi/qla2xxx/qla_init.c

+73 −76
Original line number Diff line number Diff line
@@ -95,6 +95,79 @@ qla2x00_get_async_timeout(struct scsi_qla_host *vha) 
	return tmo;

}



static void qla24xx_abort_iocb_timeout(void *data)

{

	srb_t *sp = data;

	struct srb_iocb *abt = &sp->u.iocb_cmd;



	abt->u.abt.comp_status = CS_TIMEOUT;

	sp->done(sp, QLA_FUNCTION_TIMEOUT);

}



static void qla24xx_abort_sp_done(void *ptr, int res)

{

	srb_t *sp = ptr;

	struct srb_iocb *abt = &sp->u.iocb_cmd;



	if (del_timer(&sp->u.iocb_cmd.timer)) {

		if (sp->flags & SRB_WAKEUP_ON_COMP)

			complete(&abt->u.abt.comp);

		else

			sp->free(sp);

	}

}



static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)

{

	scsi_qla_host_t *vha = cmd_sp->vha;

	struct srb_iocb *abt_iocb;

	srb_t *sp;

	int rval = QLA_FUNCTION_FAILED;



	sp = qla2xxx_get_qpair_sp(cmd_sp->vha, cmd_sp->qpair, cmd_sp->fcport,

				  GFP_ATOMIC);

	if (!sp)

		goto done;



	abt_iocb = &sp->u.iocb_cmd;

	sp->type = SRB_ABT_CMD;

	sp->name = "abort";

	sp->qpair = cmd_sp->qpair;

	if (wait)

		sp->flags = SRB_WAKEUP_ON_COMP;



	abt_iocb->timeout = qla24xx_abort_iocb_timeout;

	init_completion(&abt_iocb->u.abt.comp);

	/* FW can send 2 x ABTS's timeout/20s */

	qla2x00_init_timer(sp, 42);



	abt_iocb->u.abt.cmd_hndl = cmd_sp->handle;

	abt_iocb->u.abt.req_que_no = cpu_to_le16(cmd_sp->qpair->req->id);



	sp->done = qla24xx_abort_sp_done;



	ql_dbg(ql_dbg_async, vha, 0x507c,

	       "Abort command issued - hdl=%x, type=%x\n", cmd_sp->handle,

	       cmd_sp->type);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	if (wait) {

		wait_for_completion(&abt_iocb->u.abt.comp);

		rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ?

			QLA_SUCCESS : QLA_FUNCTION_FAILED;

	} else {

		goto done;

	}



done_free_sp:

	sp->free(sp);

done:

	return rval;

}



void

qla2x00_async_iocb_timeout(void *data)

{
@@ -1785,82 +1858,6 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun, 
	return rval;

}



static void

qla24xx_abort_iocb_timeout(void *data)

{

	srb_t *sp = data;

	struct srb_iocb *abt = &sp->u.iocb_cmd;



	abt->u.abt.comp_status = CS_TIMEOUT;

	sp->done(sp, QLA_FUNCTION_TIMEOUT);

}



static void

qla24xx_abort_sp_done(void *ptr, int res)

{

	srb_t *sp = ptr;

	struct srb_iocb *abt = &sp->u.iocb_cmd;



	if (del_timer(&sp->u.iocb_cmd.timer)) {

		if (sp->flags & SRB_WAKEUP_ON_COMP)

			complete(&abt->u.abt.comp);

		else

			sp->free(sp);

	}

}



int

qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)

{

	scsi_qla_host_t *vha = cmd_sp->vha;

	struct srb_iocb *abt_iocb;

	srb_t *sp;

	int rval = QLA_FUNCTION_FAILED;



	sp = qla2xxx_get_qpair_sp(cmd_sp->vha, cmd_sp->qpair, cmd_sp->fcport,

	    GFP_ATOMIC);

	if (!sp)

		goto done;



	abt_iocb = &sp->u.iocb_cmd;

	sp->type = SRB_ABT_CMD;

	sp->name = "abort";

	sp->qpair = cmd_sp->qpair;

	if (wait)

		sp->flags = SRB_WAKEUP_ON_COMP;



	abt_iocb->timeout = qla24xx_abort_iocb_timeout;

	init_completion(&abt_iocb->u.abt.comp);

	/* FW can send 2 x ABTS's timeout/20s */

	qla2x00_init_timer(sp, 42);



	abt_iocb->u.abt.cmd_hndl = cmd_sp->handle;

	abt_iocb->u.abt.req_que_no = cpu_to_le16(cmd_sp->qpair->req->id);



	sp->done = qla24xx_abort_sp_done;



	ql_dbg(ql_dbg_async, vha, 0x507c,

	    "Abort command issued - hdl=%x, type=%x\n",

	    cmd_sp->handle, cmd_sp->type);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	if (wait) {

		wait_for_completion(&abt_iocb->u.abt.comp);

		rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ?

			QLA_SUCCESS : QLA_FUNCTION_FAILED;

	} else {

		goto done;

	}



done_free_sp:

	sp->free(sp);

done:

	return rval;

}



int

qla24xx_async_abort_command(srb_t *sp)

{