* [PATCH] scsi: qla2xxx: fix unused function warning
@ 2018-12-10 20:51 Arnd Bergmann
2018-12-10 21:01 ` Bart Van Assche
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2018-12-10 20:51 UTC (permalink / raw)
To: qla2xxx-upstream, James E.J. Bottomley, Martin K. Petersen
Cc: Bart Van Assche, Laurence Oberman, Himanshu Madhani,
Stephen Rothwell, Arnd Bergmann, Himanshu Madhani, Quinn Tran,
Hannes Reinecke, Jens Axboe, Darren Trapp, Bill Kuzeja,
linux-scsi, linux-kernel
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;
--
2.20.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] scsi: qla2xxx: fix unused function warning
2018-12-10 20:51 [PATCH] scsi: qla2xxx: fix unused function warning Arnd Bergmann
@ 2018-12-10 21:01 ` Bart Van Assche
2018-12-10 21:28 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Bart Van Assche @ 2018-12-10 21:01 UTC (permalink / raw)
To: Arnd Bergmann, qla2xxx-upstream, James E.J. Bottomley,
Martin K. Petersen
Cc: Laurence Oberman, Himanshu Madhani, Stephen Rothwell,
Himanshu Madhani, Quinn Tran, Hannes Reinecke, Jens Axboe,
Darren Trapp, Bill Kuzeja, linux-scsi, linux-kernel
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.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] scsi: qla2xxx: fix unused function warning
2018-12-10 21:01 ` Bart Van Assche
@ 2018-12-10 21:28 ` Arnd Bergmann
2018-12-10 21:31 ` James Bottomley
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2018-12-10 21:28 UTC (permalink / raw)
To: bvanassche
Cc: qla2xxx-upstream, jejb, Martin K. Petersen, loberman,
Himanshu Madhani, Stephen Rothwell, hmadhani, quinn.tran,
Hannes Reinecke, Jens Axboe, darren.trapp, William.Kuzeja,
linux-scsi, Linux Kernel Mailing List
On Mon, Dec 10, 2018 at 10:01 PM Bart Van Assche <bvanassche@acm.org> wrote:
>
> 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.
Yes, I tried to make clear that the two branches are fine by themselves, sorry
if I was still ambiguous. The patch is currently only needed on linux-next
as far as I can tell, but we should avoid getting the same error when the
branches are merged in mainline.
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] scsi: qla2xxx: fix unused function warning
2018-12-10 21:28 ` Arnd Bergmann
@ 2018-12-10 21:31 ` James Bottomley
0 siblings, 0 replies; 4+ messages in thread
From: James Bottomley @ 2018-12-10 21:31 UTC (permalink / raw)
To: Arnd Bergmann, bvanassche
Cc: qla2xxx-upstream, Martin K. Petersen, loberman, Himanshu Madhani,
Stephen Rothwell, hmadhani, quinn.tran, Hannes Reinecke,
Jens Axboe, darren.trapp, William.Kuzeja, linux-scsi,
Linux Kernel Mailing List
On Mon, 2018-12-10 at 22:28 +0100, Arnd Bergmann wrote:
> On Mon, Dec 10, 2018 at 10:01 PM Bart Van Assche <bvanassche@acm.org>
> wrote:
> >
> > 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.
>
> Yes, I tried to make clear that the two branches are fine by
> themselves, sorry if I was still ambiguous. The patch is currently
> only needed on linux-next as far as I can tell, but we should avoid
> getting the same error when the branches are merged in mainline.
It should be fixed in linux-next as of the next release. It was just a
problem with the original merge which I fixed when I did my version of
it.
James
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-10 21:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-10 20:51 [PATCH] scsi: qla2xxx: fix unused function warning Arnd Bergmann
2018-12-10 21:01 ` Bart Van Assche
2018-12-10 21:28 ` Arnd Bergmann
2018-12-10 21:31 ` James Bottomley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).