From: Benjamin Poirier <benjamin.poirier@gmail.com>
To: Coiby Xu <coiby.xu@gmail.com>
Cc: devel@driverdev.osuosl.org, Manish Chopra <manishc@marvell.com>,
"supporter:QLOGIC QLGE 10Gb ETHERNET DRIVER"
<GR-Linux-NIC-Dev@marvell.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dan Carpenter <dan.carpenter@oracle.com>,
"open list:QLOGIC QLGE 10Gb ETHERNET DRIVER"
<netdev@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] staging: qlge: fix build breakage with dumping enabled
Date: Fri, 21 Aug 2020 17:31:59 +0900 [thread overview]
Message-ID: <20200821083159.GA16579@f3> (raw)
In-Reply-To: <20200821070334.738358-1-coiby.xu@gmail.com>
On 2020-08-21 15:03 +0800, Coiby Xu wrote:
> This fixes commit 0107635e15ac
> ("staging: qlge: replace pr_err with netdev_err") which introduced an
> build breakage with dumping enabled, i.e.,
>
> $ QL_ALL_DUMP=1 QL_OB_DUMP=1 QL_CB_DUMP=1 QL_REG_DUMP=1 \
> QL_IB_DUMP=1 QL_DEV_DUMP=1 make M=drivers/staging/qlge
>
> Fixes: 0107635e15ac ("taging: qlge: replace pr_err with netdev_err")
^ staging
> Reported-by: Benjamin Poirier <benjamin.poirier@gmail.com>
> Signed-off-by: Coiby Xu <coiby.xu@gmail.com>
> ---
> drivers/staging/qlge/qlge.h | 42 ++++++++++++++++----------------
> drivers/staging/qlge/qlge_dbg.c | 36 +++++++++++++--------------
> drivers/staging/qlge/qlge_main.c | 4 +--
> 3 files changed, 41 insertions(+), 41 deletions(-)
>
[...]
> @@ -1615,7 +1615,7 @@ void ql_dump_qdev(struct ql_adapter *qdev)
> #endif
>
> #ifdef QL_CB_DUMP
> -void ql_dump_wqicb(struct wqicb *wqicb)
> +void ql_dump_wqicb(struct ql_adapter *qdev, struct wqicb *wqicb)
> {
This can be fixed without adding another argument:
struct tx_ring *tx_ring = container_of(wqicb, struct tx_ring, wqicb);
struct ql_adapter *qdev = tx_ring->qdev;
> netdev_err(qdev->ndev, "Dumping wqicb stuff...\n");
> netdev_err(qdev->ndev, "wqicb->len = 0x%x\n", le16_to_cpu(wqicb->len));
> @@ -1630,7 +1630,7 @@ void ql_dump_wqicb(struct wqicb *wqicb)
> (unsigned long long)le64_to_cpu(wqicb->cnsmr_idx_addr));
> }
>
> -void ql_dump_tx_ring(struct tx_ring *tx_ring)
> +void ql_dump_tx_ring(struct ql_adapter *qdev, struct tx_ring *tx_ring)
> {
This can be fixed without adding another argument:
struct ql_adapter *qdev;
if (!tx_ring)
return;
qdev = tx_ring->qdev;
... similar comment for the other instances.
next prev parent reply other threads:[~2020-08-21 8:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 7:03 [PATCH] staging: qlge: fix build breakage with dumping enabled Coiby Xu
2020-08-21 8:31 ` Benjamin Poirier [this message]
2020-08-25 11:16 ` Coiby Xu
2020-08-25 22:37 ` Benjamin Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200821083159.GA16579@f3 \
--to=benjamin.poirier@gmail.com \
--cc=GR-Linux-NIC-Dev@marvell.com \
--cc=coiby.xu@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manishc@marvell.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).