Although none of the existing macro call-sites were broken,
it's always better to write macros that properly parenthesize
arguments that can be complex expressions, so that the intended
order of operations is not broken.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
include/hw/ppc/pnv_xscom.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h
index 3757b2cab9..38077b4796 100644
--- a/include/hw/ppc/pnv_xscom.h
+++ b/include/hw/ppc/pnv_xscom.h
@@ -54,7 +54,7 @@ typedef struct PnvXScomInterfaceClass {
* PCB SLAVE 0x110Fxxxx
*/
-#define PNV_XSCOM_EX_CORE_BASE(base, i) (base | (((uint64_t)i) << 24))
+#define PNV_XSCOM_EX_CORE_BASE(base, i) ((base) | ((uint64_t)(i) << 24))
#define PNV_XSCOM_EX_CORE_SIZE 0x100000
#define PNV_XSCOM_LPC_BASE 0xb0020
--
2.13.5
On 09/19/2017 04:16 PM, Eric Blake wrote: > Although none of the existing macro call-sites were broken, > it's always better to write macros that properly parenthesize > arguments that can be complex expressions, so that the intended > order of operations is not broken. yes. > Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> C. > --- > include/hw/ppc/pnv_xscom.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h > index 3757b2cab9..38077b4796 100644 > --- a/include/hw/ppc/pnv_xscom.h > +++ b/include/hw/ppc/pnv_xscom.h > @@ -54,7 +54,7 @@ typedef struct PnvXScomInterfaceClass { > * PCB SLAVE 0x110Fxxxx > */ > > -#define PNV_XSCOM_EX_CORE_BASE(base, i) (base | (((uint64_t)i) << 24)) > +#define PNV_XSCOM_EX_CORE_BASE(base, i) ((base) | ((uint64_t)(i) << 24)) > #define PNV_XSCOM_EX_CORE_SIZE 0x100000 > > #define PNV_XSCOM_LPC_BASE 0xb0020 >
On Tue, Sep 19, 2017 at 09:16:03AM -0500, Eric Blake wrote: > Although none of the existing macro call-sites were broken, > it's always better to write macros that properly parenthesize > arguments that can be complex expressions, so that the intended > order of operations is not broken. > > Signed-off-by: Eric Blake <eblake@redhat.com> Applied to ppc-for-2.11, thanks. > --- > include/hw/ppc/pnv_xscom.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h > index 3757b2cab9..38077b4796 100644 > --- a/include/hw/ppc/pnv_xscom.h > +++ b/include/hw/ppc/pnv_xscom.h > @@ -54,7 +54,7 @@ typedef struct PnvXScomInterfaceClass { > * PCB SLAVE 0x110Fxxxx > */ > > -#define PNV_XSCOM_EX_CORE_BASE(base, i) (base | (((uint64_t)i) << 24)) > +#define PNV_XSCOM_EX_CORE_BASE(base, i) ((base) | ((uint64_t)(i) << 24)) > #define PNV_XSCOM_EX_CORE_SIZE 0x100000 > > #define PNV_XSCOM_LPC_BASE 0xb0020 -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
© 2016 - 2024 Red Hat, Inc.