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

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

scsi: qla2xxx: Enable type checking for the SRB free and done callback functions 



Since all pointers passed to the srb_t.done() and srb_t.free() functions
have type srb_t, change the type of the first argument of these functions
from void * into struct srb *. This allows the compiler to verify the
argument types for these functions. This patch does not change any
functionality.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent aa20e38b

drivers/scsi/qla2xxx/qla_bsg.c

+2 −6
Original line number Diff line number Diff line
@@ -12,10 +12,8 @@ 
#include <linux/bsg-lib.h>



/* BSG support for ELS/CT pass through */

void

qla2x00_bsg_job_done(void *ptr, int res)

void qla2x00_bsg_job_done(srb_t *sp, int res)

{

	srb_t *sp = ptr;

	struct bsg_job *bsg_job = sp->u.bsg_job;

	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
@@ -25,10 +23,8 @@ qla2x00_bsg_job_done(void *ptr, int res) 
	sp->free(sp);

}



void

qla2x00_bsg_sp_free(void *ptr)

void qla2x00_bsg_sp_free(srb_t *sp)

{

	srb_t *sp = ptr;

	struct qla_hw_data *ha = sp->vha->hw;

	struct bsg_job *bsg_job = sp->u.bsg_job;

	struct fc_bsg_request *bsg_request = bsg_job->request;

drivers/scsi/qla2xxx/qla_def.h

+12 −2
Original line number Diff line number Diff line
@@ -614,8 +614,18 @@ typedef struct srb { 
		struct bsg_job *bsg_job;

		struct srb_cmd scmd;

	} u;

	void (*done)(void *, int);

	void (*free)(void *);

	/*

	 * Report completion status @res and call sp_put(@sp). @res is

	 * an NVMe status code, a SCSI result (e.g. DID_OK << 16) or a

	 * QLA_* status value.

	 */

	void (*done)(struct srb *sp, int res);

	/* Stop the timer and free @sp. Only used by the FCP code. */

	void (*free)(struct srb *sp);

	/*

	 * Call nvme_private->fd->done() and free @sp. Only used by the NVMe

	 * code.

	 */

	void (*put_fn)(struct kref *kref);

} srb_t;

drivers/scsi/qla2xxx/qla_gbl.h

+7 −7
Original line number Diff line number Diff line
@@ -213,9 +213,9 @@ extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32); 


extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);

extern void qla2x00_disable_board_on_pci_error(struct work_struct *);

extern void qla2x00_sp_compl(void *, int);

extern void qla2xxx_qpair_sp_free_dma(void *);

extern void qla2xxx_qpair_sp_compl(void *, int);

extern void qla2x00_sp_compl(srb_t *sp, int);

extern void qla2xxx_qpair_sp_free_dma(srb_t *sp);

extern void qla2xxx_qpair_sp_compl(srb_t *sp, int);

extern void qla24xx_sched_upd_fcport(fc_port_t *);

void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *,

	uint16_t *);
@@ -244,7 +244,7 @@ extern void qla2x00_do_dpc_all_vps(scsi_qla_host_t *); 
extern int qla24xx_vport_create_req_sanity_check(struct fc_vport *);

extern scsi_qla_host_t *qla24xx_create_vhost(struct fc_vport *);



extern void qla2x00_sp_free_dma(void *);

extern void qla2x00_sp_free_dma(srb_t *sp);

extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);



extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);
@@ -790,10 +790,10 @@ extern int qla82xx_restart_isp(scsi_qla_host_t *); 


/* IOCB related functions */

extern int qla82xx_start_scsi(srb_t *);

extern void qla2x00_sp_free(void *);

extern void qla2x00_sp_free(srb_t *sp);

extern void qla2x00_sp_timeout(struct timer_list *);

extern void qla2x00_bsg_job_done(void *, int);

extern void qla2x00_bsg_sp_free(void *);

extern void qla2x00_bsg_job_done(srb_t *sp, int);

extern void qla2x00_bsg_sp_free(srb_t *sp);

extern void qla2x00_start_iocbs(struct scsi_qla_host *, struct req_que *);



/* Interrupt related */

drivers/scsi/qla2xxx/qla_gs.c

+7 −14
Original line number Diff line number Diff line
@@ -499,9 +499,8 @@ qla2x00_gnn_id(scsi_qla_host_t *vha, sw_info_t *list) 
	return (rval);

}



static void qla2x00_async_sns_sp_done(void *s, int rc)

static void qla2x00_async_sns_sp_done(srb_t *sp, int rc)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	struct ct_sns_pkt *ct_sns;

	struct qla_work_evt *e;
@@ -2989,9 +2988,8 @@ void qla24xx_handle_gpsc_event(scsi_qla_host_t *vha, struct event_arg *ea) 
	qla_post_iidma_work(vha, fcport);

}



static void qla24xx_async_gpsc_sp_done(void *s, int res)

static void qla24xx_async_gpsc_sp_done(srb_t *sp, int res)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	struct qla_hw_data *ha = vha->hw;

	fc_port_t *fcport = sp->fcport;
@@ -3258,9 +3256,8 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea) 
	}

}



static void qla2x00_async_gpnid_sp_done(void *s, int res)

static void qla2x00_async_gpnid_sp_done(srb_t *sp, int res)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	struct ct_sns_req *ct_req =

	    (struct ct_sns_req *)sp->u.iocb_cmd.u.ctarg.req;
@@ -3446,9 +3443,8 @@ void qla24xx_handle_gffid_event(scsi_qla_host_t *vha, struct event_arg *ea) 
	qla24xx_post_gnl_work(vha, fcport);

}



void qla24xx_async_gffid_sp_done(void *s, int res)

void qla24xx_async_gffid_sp_done(srb_t *sp, int res)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	fc_port_t *fcport = sp->fcport;

	struct ct_sns_rsp *ct_rsp;
@@ -3872,9 +3868,8 @@ static void qla2x00_find_free_fcp_nvme_slot(struct scsi_qla_host *vha, 
	}

}



static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res)

static void qla2x00_async_gpnft_gnnft_sp_done(srb_t *sp, int res)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	struct ct_sns_req *ct_req =

		(struct ct_sns_req *)sp->u.iocb_cmd.u.ctarg.req;
@@ -4251,9 +4246,8 @@ void qla24xx_handle_gnnid_event(scsi_qla_host_t *vha, struct event_arg *ea) 
	qla24xx_post_gnl_work(vha, ea->fcport);

}



static void qla2x00_async_gnnid_sp_done(void *s, int res)

static void qla2x00_async_gnnid_sp_done(srb_t *sp, int res)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	fc_port_t *fcport = sp->fcport;

	u8 *node_name = fcport->ct_desc.ct_sns->p.rsp.rsp.gnn_id.node_name;
@@ -4384,9 +4378,8 @@ void qla24xx_handle_gfpnid_event(scsi_qla_host_t *vha, struct event_arg *ea) 
	qla24xx_post_gpsc_work(vha, fcport);

}



static void qla2x00_async_gfpnid_sp_done(void *s, int res)

static void qla2x00_async_gfpnid_sp_done(srb_t *sp, int res)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	fc_port_t *fcport = sp->fcport;

	u8 *fpn = fcport->ct_desc.ct_sns->p.rsp.rsp.gfpn_id.port_name;

drivers/scsi/qla2xxx/qla_init.c

+10 −30
Original line number Diff line number Diff line
@@ -63,10 +63,8 @@ qla2x00_sp_timeout(struct timer_list *t) 
	iocb->timeout(sp);

}



void

qla2x00_sp_free(void *ptr)

void qla2x00_sp_free(srb_t *sp)

{

	srb_t *sp = ptr;

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



	del_timer(&iocb->timer);
@@ -117,9 +115,8 @@ static void qla24xx_abort_iocb_timeout(void *data) 
	sp->done(sp, QLA_OS_TIMER_EXPIRED);

}



static void qla24xx_abort_sp_done(void *ptr, int res)

static void qla24xx_abort_sp_done(srb_t *sp, int res)

{

	srb_t *sp = ptr;

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



	del_timer(&sp->u.iocb_cmd.timer);
@@ -249,10 +246,8 @@ qla2x00_async_iocb_timeout(void *data) 
	}

}



static void

qla2x00_async_login_sp_done(void *ptr, int res)

static void qla2x00_async_login_sp_done(srb_t *sp, int res)

{

	srb_t *sp = ptr;

	struct scsi_qla_host *vha = sp->vha;

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

	struct event_arg ea;
@@ -358,11 +353,8 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport, 
	return rval;

}



static void

qla2x00_async_logout_sp_done(void *ptr, int res)

static void qla2x00_async_logout_sp_done(srb_t *sp, int res)

{

	srb_t *sp = ptr;



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

	sp->fcport->login_gen++;

	qlt_logo_completion_handler(sp->fcport, res);
@@ -419,10 +411,8 @@ qla2x00_async_prlo_done(struct scsi_qla_host *vha, fc_port_t *fcport, 
	qlt_logo_completion_handler(fcport, data[0]);

}



static void

qla2x00_async_prlo_sp_done(void *s, int res)

static void qla2x00_async_prlo_sp_done(srb_t *sp, int res)

{

	srb_t *sp = (srb_t *)s;

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

	struct scsi_qla_host *vha = sp->vha;
@@ -525,10 +515,8 @@ static int qla_post_els_plogi_work(struct scsi_qla_host *vha, fc_port_t *fcport) 
	return qla2x00_post_work(vha, e);

}



static void

qla2x00_async_adisc_sp_done(void *ptr, int res)

static void qla2x00_async_adisc_sp_done(srb_t *sp, int res)

{

	srb_t *sp = ptr;

	struct scsi_qla_host *vha = sp->vha;

	struct event_arg ea;

	struct srb_iocb *lio = &sp->u.iocb_cmd;
@@ -931,10 +919,8 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, 
	}

} /* gnl_event */



static void

qla24xx_async_gnl_sp_done(void *s, int res)

static void qla24xx_async_gnl_sp_done(srb_t *sp, int res)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	unsigned long flags;

	struct fc_port *fcport = NULL, *tf;
@@ -1121,10 +1107,8 @@ int qla24xx_post_gnl_work(struct scsi_qla_host *vha, fc_port_t *fcport) 
	return qla2x00_post_work(vha, e);

}



static

void qla24xx_async_gpdb_sp_done(void *s, int res)

static void qla24xx_async_gpdb_sp_done(srb_t *sp, int res)

{

	struct srb *sp = s;

	struct scsi_qla_host *vha = sp->vha;

	struct qla_hw_data *ha = vha->hw;

	fc_port_t *fcport = sp->fcport;
@@ -1168,10 +1152,8 @@ static int qla24xx_post_prli_work(struct scsi_qla_host *vha, fc_port_t *fcport) 
	return qla2x00_post_work(vha, e);

}



static void

qla2x00_async_prli_sp_done(void *ptr, int res)

static void qla2x00_async_prli_sp_done(srb_t *sp, int res)

{

	srb_t *sp = ptr;

	struct scsi_qla_host *vha = sp->vha;

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

	struct event_arg ea;
@@ -1808,10 +1790,8 @@ qla2x00_tmf_iocb_timeout(void *data) 
	complete(&tmf->u.tmf.comp);

}



static void

qla2x00_tmf_sp_done(void *ptr, int res)

static void qla2x00_tmf_sp_done(srb_t *sp, int res)

{

	srb_t *sp = ptr;

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



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