* [PATCH] [net-next v2] octeontx2: hide unused label
@ 2025-02-19 16:21 Arnd Bergmann
2025-02-19 18:00 ` [EXTERNAL] " Suman Ghosh
2025-02-21 2:17 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2025-02-19 16:21 UTC (permalink / raw)
To: Sunil Goutham, Geetha sowjanya, Subbaraya Sundeep, hariprasad,
Bharat Bhushan
Cc: Arnd Bergmann, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Simon Horman, Suman Ghosh,
Sai Krishna, Nithin Dabilpuram, netdev, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
A previous patch introduces a build-time warning when CONFIG_DCB
is disabled:
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c: In function 'otx2_probe':
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c:3217:1: error: label 'err_free_zc_bmap' defined but not used [-Werror=unused-label]
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c: In function 'otx2vf_probe':
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c:740:1: error: label 'err_free_zc_bmap' defined but not used [-Werror=unused-label]
Add the same #ifdef check around it.
Fixes: efabce290151 ("octeontx2-pf: AF_XDP zero copy receive support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
v2: fix typo s/CONfiG_DCB/CONFIG_DCB/
---
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 ++
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index c7c562f0f5e5..cfed9ec5b157 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -3214,8 +3214,10 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return 0;
+#ifdef CONFIG_DCB
err_free_zc_bmap:
bitmap_free(pf->af_xdp_zc_qidx);
+#endif
err_sriov_cleannup:
otx2_sriov_vfcfg_cleanup(pf);
err_pf_sriov_init:
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
index 63ddd262d122..7ef3ba477d49 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
@@ -737,8 +737,10 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return 0;
+#ifdef CONFIG_DCB
err_free_zc_bmap:
bitmap_free(vf->af_xdp_zc_qidx);
+#endif
err_unreg_devlink:
otx2_unregister_dl(vf);
err_shutdown_tc:
--
2.39.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [EXTERNAL] [PATCH] [net-next v2] octeontx2: hide unused label
2025-02-19 16:21 [PATCH] [net-next v2] octeontx2: hide unused label Arnd Bergmann
@ 2025-02-19 18:00 ` Suman Ghosh
2025-02-21 2:17 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Suman Ghosh @ 2025-02-19 18:00 UTC (permalink / raw)
To: Arnd Bergmann, Sunil Kovvuri Goutham, Geethasowjanya Akula,
Subbaraya Sundeep Bhatta, Hariprasad Kelam, Bharat Bhushan
Cc: Arnd Bergmann, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Simon Horman, Sai Krishna Gajula,
Nithin Kumar Dabilpuram, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
> drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 ++
>drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 ++
> 2 files changed, 4 insertions(+)
>
>diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
>b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
>index c7c562f0f5e5..cfed9ec5b157 100644
>--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
>+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
>@@ -3214,8 +3214,10 @@ static int otx2_probe(struct pci_dev *pdev, const
>struct pci_device_id *id)
>
> return 0;
>
>+#ifdef CONFIG_DCB
> err_free_zc_bmap:
> bitmap_free(pf->af_xdp_zc_qidx);
>+#endif
> err_sriov_cleannup:
> otx2_sriov_vfcfg_cleanup(pf);
> err_pf_sriov_init:
>diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
>b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
>index 63ddd262d122..7ef3ba477d49 100644
>--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
>+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
>@@ -737,8 +737,10 @@ static int otx2vf_probe(struct pci_dev *pdev, const
>struct pci_device_id *id)
>
> return 0;
>
>+#ifdef CONFIG_DCB
> err_free_zc_bmap:
> bitmap_free(vf->af_xdp_zc_qidx);
>+#endif
> err_unreg_devlink:
> otx2_unregister_dl(vf);
> err_shutdown_tc:
>--
>2.39.5
[Suman] Thanks for the patch, looks good to me.
Reviewed-by: Suman Ghosh <sumang@marvell.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [net-next v2] octeontx2: hide unused label
2025-02-19 16:21 [PATCH] [net-next v2] octeontx2: hide unused label Arnd Bergmann
2025-02-19 18:00 ` [EXTERNAL] " Suman Ghosh
@ 2025-02-21 2:17 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-02-21 2:17 UTC (permalink / raw)
To: Arnd Bergmann
Cc: sgoutham, gakula, sbhatta, hkelam, bbhushan2, arnd, andrew+netdev,
davem, edumazet, kuba, pabeni, horms, sumang, saikrishnag,
ndabilpuram, netdev, linux-kernel
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 19 Feb 2025 17:21:14 +0100 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> A previous patch introduces a build-time warning when CONFIG_DCB
> is disabled:
>
> drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c: In function 'otx2_probe':
> drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c:3217:1: error: label 'err_free_zc_bmap' defined but not used [-Werror=unused-label]
> drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c: In function 'otx2vf_probe':
> drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c:740:1: error: label 'err_free_zc_bmap' defined but not used [-Werror=unused-label]
>
> [...]
Here is the summary with links:
- [net-next,v2] octeontx2: hide unused label
https://git.kernel.org/netdev/net-next/c/ca57d1c56f40
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-21 2:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-19 16:21 [PATCH] [net-next v2] octeontx2: hide unused label Arnd Bergmann
2025-02-19 18:00 ` [EXTERNAL] " Suman Ghosh
2025-02-21 2:17 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox