Module Name: src
Committed By: skrll
Date: Fri Feb 16 12:08:29 UTC 2024
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_eth.c bcm53xx_pax.c
Log Message:
Fix non-DIAGNOSTIC build
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/broadcom/bcm53xx_pax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.43
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42 Sat Sep 17 19:41:18 2022
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Fri Feb 16 12:08:29 2024
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42 2022/09/17 19:41:18 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.43 2024/02/16 12:08:29 skrll Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -252,9 +252,7 @@ bcmeth_ccb_match(device_t parent, cfdata
if (strcmp(cf->cf_name, loc->loc_name))
return 0;
-#ifdef DIAGNOSTIC
- const int port = cf->cf_loc[BCMCCBCF_PORT];
-#endif
+ const int port __diagused = cf->cf_loc[BCMCCBCF_PORT];
KASSERT(port == BCMCCBCF_PORT_DEFAULT || port == loc->loc_port);
return 1;
Index: src/sys/arch/arm/broadcom/bcm53xx_pax.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.22 src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.23
--- src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.22 Sat Aug 7 16:18:43 2021
+++ src/sys/arch/arm/broadcom/bcm53xx_pax.c Fri Feb 16 12:08:29 2024
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.22 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.23 2024/02/16 12:08:29 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -136,9 +136,7 @@ bcmpax_ccb_match(device_t parent, cfdata
if (strcmp(cf->cf_name, loc->loc_name))
return 0;
-#ifdef DIAGNOSTIC
- const int port = cf->cf_loc[BCMCCBCF_PORT];
-#endif
+ const int port __diagused = cf->cf_loc[BCMCCBCF_PORT];
KASSERT(port == BCMCCBCF_PORT_DEFAULT || port == loc->loc_port);
return 1;
