Patch "qla2xxx: remove redundant declaration in 'qla_gbl.h'" has been added to the 3.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
qla2xxx: remove redundant declaration in 'qla_gbl.h'
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
qla2xxx-remove-redundant-declaration-in-qla_gbl.h.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
9493c2422cae272d6f1f567cbb424195defe4176Mon Sep 17 00:00:00 2001
From: Chen Gang <[email protected]>
Date: Sat, 1 Nov 2014 19:46:12 +0800
Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h'
From: Chen Gang <[email protected]>
commit 9493c2422cae272d6f1f567cbb424195defe4176 upstream.
Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and qla8044_need_reset_handler(). At present, within upstream next kernel source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c".
The related error and warnings (with allmodconfig under tile):
CC [M] drivers/scsi/qla2xxx/qla_nx2.o
drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration
qla8044_need_reset_handler(struct scsi_qla_host *vha)
^
In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0,
from drivers/scsi/qla2xxx/qla_nx2.c:11:
drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here
extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha);
^ drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1
make[2]: *** [drivers/scsi/qla2xxx] Error 2
make[1]: *** [drivers/scsi] Error 2
make: *** [drivers] Error 2
CC [M] drivers/scsi/qla2xxx/qla_tmpl.o
In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0,
from drivers/scsi/qla2xxx/qla_tmpl.c:7:
drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined
extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha);
^--- drivers/scsi/qla2xxx/qla_gbl.h | 2 -- drivers/scsi/qla2xxx/qla_nx2.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_gbl.h +0 -2
@@ -728,8 +728,6 @@ extern void qla8044_set_idc_dontreset(stextern int qla8044_rd_direct (struct scsi_qla_host *vha,const uint32_t crb_reg);extern void qla8044_wr_direct (struct scsi_qla_host *vha,const uint32_t crb_reg,const uint32_t value); -extern inline void qla8044_set_qsnt_ready (struct scsi_qla_host *vha); -extern inline void qla8044_need_reset_handler (struct scsi_qla_host *vha);extern int qla8044_device_state_handler (struct scsi_qla_host *vha);extern void qla8044_clear_qsnt_ready (struct scsi_qla_host *vha);extern void qla8044_clear_drv_active (struct qla_hw_data *);
drivers/scsi/qla2xxx/qla_nx2.c +1 -1
@@ -146,7 +146,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_hostreturn ; } -inline void +static inline void qla8044_set_qsnt_ready (struct scsi_qla_host *vha) {uint32_t qsnt_state;
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/qla2xxx-remove-redundant-declaration-in-qla_gbl.h.patch