Re: [PATCH] scsi: qla2xxx: fix unused function warning

[Bart Van Assche <bvanassche@acm.org>]

On Mon, 2018-12-10 at 21:51 +0100, Arnd Bergmann wrote:
> In what seems to be a mismatch between the scsi-fixes branch and
> the scsi-mkp/for-next branch, a newly introduced variable from
> one patch got obsoleted in another one:
> 
> drivers/scsi/qla2xxx/qla_os.c: In function '__qla2x00_abort_all_cmds':
> drivers/scsi/qla2xxx/qla_os.c:1791:11: error: unused variable 'status' [-Werror=unused-variable]
> 
> Remove the variable again.
> 
> Fixes: c4e521b654e1 ("scsi: qla2xxx: Split the __qla2x00_abort_all_cmds() function")
> Fixes: f2ffd4e5bc7b ("scsi: qla2xxx: Timeouts occur on surprise removal of QLogic adapter")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> Maybe check carefully that the merge in linux-next is otherwise correct
> ---
>  drivers/scsi/qla2xxx/qla_os.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index 63c47bc7ae59..db331cb5ba3c 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -1788,7 +1788,7 @@ static void qla2x00_abort_srb(struct qla_qpair *qp, srb_t *sp, const int res,
>  static void
>  __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res)
>  {
> -	int cnt, status;
> +	int cnt;
>  	unsigned long flags;
>  	srb_t *sp;
>  	scsi_qla_host_t *vha = qp->vha;

When I prepared commit c4e521b654e1 I verified that my patch did not produce any
warnings when building with W=1. So something must be wrong at your side. Did you
perhaps start from linux-next to prepare this patch? If so, please submit this
patch to Stephen Rothwell.

Bart.