git: dfd26e29dd43 - stable/14 - dev/hwpmc: Fix the dmc620 MD4 macro

From: Andrew Turner <andrew_at_FreeBSD.org>
Date: Mon, 15 Jul 2024 12:38:28 UTC
The branch stable/14 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=dfd26e29dd43e4370ba31159c57fa474ef6e995b

commit dfd26e29dd43e4370ba31159c57fa474ef6e995b
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-05-22 08:19:49 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-07-15 12:27:45 +0000

    dev/hwpmc: Fix the dmc620 MD4 macro
    
    Add braces to the dmc620 MD4 macro to fix the GCC build.
    
    Reviewed by:    brooks, imp, jhb
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D45266
    
    (cherry picked from commit 131c1718c6331e87f139b42b4ad0e57b6a71ea44)
---
 sys/dev/hwpmc/pmu_dmc620.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/hwpmc/pmu_dmc620.c b/sys/dev/hwpmc/pmu_dmc620.c
index 42e5dfdbf154..c33e5264f7de 100644
--- a/sys/dev/hwpmc/pmu_dmc620.c
+++ b/sys/dev/hwpmc/pmu_dmc620.c
@@ -68,7 +68,7 @@ struct pmu_dmc620_softc {
 
 #define	RD4(sc, r)		bus_read_4((sc)->sc_res[0], (r))
 #define	WR4(sc, r, v)		bus_write_4((sc)->sc_res[0], (r), (v))
-#define	MD4(sc, r, c, s)	WR4((sc), (r), RD4((sc), (r)) & ~(c) | (s))
+#define	MD4(sc, r, c, s)	WR4((sc), (r), (RD4((sc), (r)) & ~(c)) | (s))
 
 #define	CD2MD4(sc, u, r, c, s)	MD4((sc), DMC620_CLKDIV2_REG((u), (r)), (c), (s))
 #define	CMD4(sc, u, r, c, s)	MD4((sc), DMC620_CLK_REG((u), (r)), (c), (s))