mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 03:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

qla2x00t: Follow-up for r7293 and r7294

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7302 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2017-12-29 23:56:21 +00:00
parent df74fa408e
commit e86fc13ff6
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
qla2x00t/qla_gbl.h
View File

@@ -143,8 +143,9 @@ extern void qla2x00_free_fcports(struct scsi_qla_host *);
*/
extern struct scsi_host_template qla2xxx_driver_template;
extern struct scsi_transport_template *qla2xxx_transport_vport_template;
extern void qla2x00_timer(scsi_qla_host_t *);
extern void qla2x00_start_timer(scsi_qla_host_t *, void *, unsigned long);
extern void qla2x00_timer(struct timer_list *);
extern void qla2x00_start_timer(scsi_qla_host_t *,
void (*)(struct timer_list *), unsigned long);
extern void qla24xx_deallocate_vp_id(scsi_qla_host_t *);
extern int qla24xx_init_vp(scsi_qla_host_t *);
extern int qla24xx_disable_vp(scsi_qla_host_t *);
@@ -567,7 +568,7 @@ extern int qla82xx_mbx_intr_disable(scsi_qla_host_t *);
extern int qla82xx_start_scsi(srb_t *);
extern void qla82xx_start_iocbs(scsi_qla_host_t *);
extern void qla2x00_sp_free(void *, void *);
extern void qla2x00_sp_timeout(unsigned long);
extern void qla2x00_sp_timeout(struct timer_list *timer);
extern void qla2x00_bsg_job_done(void *, void *, int);
extern void qla2x00_bsg_sp_free(void *, void *);

8
qla2x00t/qla_os.c
View File

@@ -323,9 +323,10 @@ struct scsi_transport_template *qla2xxx_transport_vport_template = NULL;
*/
__inline__ void
qla2x00_start_timer(scsi_qla_host_t *vha, void *func, unsigned long interval)
qla2x00_start_timer(scsi_qla_host_t *vha, void (*func)(struct timer_list *),
unsigned long interval)
{
init_timer(&vha->timer, func, (unsigned long)vha);
timer_setup(&vha->timer, func, 0);
vha->timer.expires = jiffies + interval * HZ;
add_timer(&vha->timer);
vha->timer_active = 1;
@@ -4267,8 +4268,9 @@ qla2x00_rst_aen(scsi_qla_host_t *vha)
* Context: Interrupt
***************************************************************************/
void
qla2x00_timer(scsi_qla_host_t *vha)
qla2x00_timer(struct timer_list *timer)
{
scsi_qla_host_t *vha = container_of(timer, typeof(*vha), timer);
unsigned long cpu_flags = 0;
int start_dpc = 0;
int index;