]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
octeontx2: hide unused label
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Feb 2025 16:21:14 +0000 (17:21 +0100)
committerJakub Kicinski <kuba@kernel.org>
Fri, 21 Feb 2025 01:38:02 +0000 (17:38 -0800)
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>
Reviewed-by: Suman Ghosh <sumang@marvell.com>
Link: https://patch.msgid.link/20250219162239.1376865-1-arnd@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c

index c7c562f0f5e5ce7d240261f9957d447c9621d67c..cfed9ec5b157983951fe298c24ab25bdbe358fb9 100644 (file)
@@ -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:
index 63ddd262d1229b27c840bc79f411d643081dd100..7ef3ba477d4964388289bc1feda5a0b1784928a0 100644 (file)
@@ -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: