Messages in this thread Patch in this message | | | From | Colin Foster <> | Subject | [PATCH v2 net-next 09/14] pinctrl: ocelot: avoid macro redefinition | Date | Wed, 21 Sep 2022 21:00:57 -0700 |
| |
The macro REG gets defined in at least two locations - drivers/pinctrl/pinctrl-ocelot.c and include/soc/mscc/ocelot.h. While pinctrl-ocelot.c doesn't include include/soc/mscc/ocelot.h, it does in fact include include/linux/mfd/ocelot.h.
This was all fine, until include/linux/mfd/ocelot.h needed resources from include/soc/mscc/ocelot.h. At that point the REG macro becomes redefined, and will throw a compiler error.
Undefine the REG macro in drivers/pinctrl/pinctrl-ocelot.c before it is defined to avoid this error.
Signed-off-by: Colin Foster <colin.foster@in-advantage.com> ---
v2 * New patch
--- drivers/pinctrl/pinctrl-ocelot.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index f635743a639d..b2191407fc1a 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -1231,6 +1231,7 @@ static int lan966x_pinmux_set_mux(struct pinctrl_dev *pctldev, return 0; } +#undef REG #define REG(r, info, p) ((r) * (info)->stride + (4 * ((p) / 32))) static int ocelot_gpio_set_direction(struct pinctrl_dev *pctldev, -- 2.25.1
| |