diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c
index 429e5e33c..7ff31b48d 100644
--- a/fcst/ft_cmd.c
+++ b/fcst/ft_cmd.c
@@ -169,7 +169,7 @@ static void ft_cmd_tm_dump(struct scst_mgmt_cmd *mcmd, const char *caller)
 		ft_cmd_dump(mcmd->cmd_to_abort, caller);
 }
 
-/**
+/*
  * ft_set_cmd_state() - set the state of a command
  */
 static enum ft_cmd_state ft_set_cmd_state(struct ft_cmd *fcmd,
@@ -186,7 +186,7 @@ static enum ft_cmd_state ft_set_cmd_state(struct ft_cmd *fcmd,
 	return previous;
 }
 
-/**
+/*
  * ft_test_and_set_cmd_state() - test and set the state of a command
  *
  * Returns true if and only if the previous command state was equal to 'old'.
@@ -862,15 +862,13 @@ static void ft_cmd_ls_rjt(struct fc_frame *rx_fp, enum fc_els_rjt_reason reason,
 	lport->tt.seq_send(lport, sp, fp);
 #else
 	struct fc_seq_els_data rjt_data;
-	struct fc_lport *lport;
 
-	lport = fr_dev(rx_fp);
 	rjt_data.reason = reason;
 	rjt_data.explan = explan;
 #ifdef NEW_LIBFC_API
 	fc_seq_els_rsp_send(rx_fp, ELS_LS_RJT, &rjt_data);
 #else
-	lport->tt.seq_els_rsp_send(rx_fp, ELS_LS_RJT, &rjt_data);
+	fr_dev(rx_fp)->tt.seq_els_rsp_send(rx_fp, ELS_LS_RJT, &rjt_data);
 #endif
 #endif
 }
diff --git a/qla2x00t/qla_gbl.h b/qla2x00t/qla_gbl.h
index 14d103ce0..2f7a40bbd 100644
--- a/qla2x00t/qla_gbl.h
+++ b/qla2x00t/qla_gbl.h
@@ -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 *);
 
diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c
index d9f518d55..53a3450c1 100644
--- a/qla2x00t/qla_os.c
+++ b/qla2x00t/qla_os.c
@@ -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;
diff --git a/qla2x00t/qla_sup.c b/qla2x00t/qla_sup.c
index 4bec28999..b8e954dfb 100644
--- a/qla2x00t/qla_sup.c
+++ b/qla2x00t/qla_sup.c
@@ -2370,6 +2370,7 @@ qla2x00_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,
 				sec_mask = 0x1e000;
 				break;
 			}
+			/* Fall through... */
 		default:
 			/* Default to 16 kb sector size. */
 			rest_addr = 0x3fff;