riscv: alternatives: Don't name unused macro parameters

Without CONFIG_RISCV_ALTERNATIVE only the first parameter of the
ALTERNATIVE macros is needed. Use ... for the rest to cut down on
clutter. While there, fix a couple space vs. tab issues.

Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20221129150053.50464-3-ajones@ventanamicro.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Andrew Jones 2022-11-29 16:00:51 +01:00 committed by Palmer Dabbelt
parent 2ba8c7dc71
commit 7d52eace1b
No known key found for this signature in database
GPG key ID: 2E1319F35FBB1889

View file

@ -130,28 +130,22 @@
\old_c \old_c
.endm .endm
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \ #define _ALTERNATIVE_CFG(old_c, ...) \
__ALTERNATIVE_CFG old_c __ALTERNATIVE_CFG old_c
#define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, \ #define _ALTERNATIVE_CFG_2(old_c, ...) \
CONFIG_k_1, \ __ALTERNATIVE_CFG old_c
new_c_2, vendor_id_2, errata_id_2, \
CONFIG_k_2) \
__ALTERNATIVE_CFG old_c
#else /* !__ASSEMBLY__ */ #else /* !__ASSEMBLY__ */
#define __ALTERNATIVE_CFG(old_c) \ #define __ALTERNATIVE_CFG(old_c) \
old_c "\n" old_c "\n"
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \ #define _ALTERNATIVE_CFG(old_c, ...) \
__ALTERNATIVE_CFG(old_c) __ALTERNATIVE_CFG(old_c)
#define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, \ #define _ALTERNATIVE_CFG_2(old_c, ...) \
CONFIG_k_1, \ __ALTERNATIVE_CFG(old_c)
new_c_2, vendor_id_2, errata_id_2, \
CONFIG_k_2) \
__ALTERNATIVE_CFG(old_c)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* CONFIG_RISCV_ALTERNATIVE */ #endif /* CONFIG_RISCV_ALTERNATIVE */