Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org, netdev@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Linus Walleij <linus.walleij@linaro.org>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Lee Jones <lee@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Vladimir Oltean <olteanv@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>
Subject: [PATCH v3 net-next 09/14] pinctrl: ocelot: avoid macro redefinition
Date:   Sun, 25 Sep 2022 17:29:23 -0700
Message-Id: <20220926002928.2744638-10-colin.foster@in-advantage.com>
In-Reply-To: <20220926002928.2744638-1-colin.foster@in-advantage.com>
References: <20220926002928.2744638-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?U+NyP+LYXXw4dq05qV3+ScatVX5UKdUNPSjNAfMv2llIKI/g4RvMYgC/NREl?=
 =?us-ascii?Q?pAAkt6fogrGROajs1IXMKaEhVchrKFA9U4j8nA7gnW1XEN7yTjdAsIYh33f/?=
 =?us-ascii?Q?ZFxkkL+Z+R0d8dUvZpZqqhUDLSPamkZllNYYTOxwmTmHn0MUUgy2BpG9kryq?=
 =?us-ascii?Q?oZRotHSaCXNGafCVjmszWIoD2wl0fih658K+IQ2wxAAJ8LKZQD0Wn+pEe6YG?=
 =?us-ascii?Q?nGWPaQkIowjgIk6ab14Tn/Fh5R5Q7a77KszkQ2r6CtUlPtvTLI1F/Zo8jey8?=
 =?us-ascii?Q?PAEZYTQ7Ud3+jTRyuvN9qqDNrWMHh/bhrSXfEQsXlIXB17QjXwGMjqPntWRJ?=
 =?us-ascii?Q?3aL8UNfXv6NunqbfmSwyhD/e+F3TXorVkaYg3S+DJCskQpjYX/y1GqSRP5fB?=
 =?us-ascii?Q?sS6MBHDFZLJfREsDuCOP0UTF5q1N/LW0+09YVPEZtjmqwOGhlcmao9YC8kTe?=
 =?us-ascii?Q?P12zfxxhzm0hPOJGXbfJeWudEcSnsj4tBlmDyPde93uK8lQPpKczhQu0m5Gy?=
 =?us-ascii?Q?0vzC5sdP22NGWZINcIxufwdCXZTkQKHfp5zgG/2xDOZZi78GZ23fkhn+Os6G?=
 =?us-ascii?Q?8QTCa+1H9bXoYDCE8UHZp7JHVdcZS5vscXA4R84Av1Q1InK2gXM+ekpSHEf8?=
 =?us-ascii?Q?Y/HvNERuBdqeQUh0U4re6ebWsIr3OCJuB4R8qKy8dn5ZQ2lWOXldMknrp6ID?=
 =?us-ascii?Q?n71lJpTBxmTK21YbaoWph1wr2bpR7WN8i3zkMqnQiJOGCkBZdDO8SydH9FDQ?=
 =?us-ascii?Q?d1B/zJ6hRF9IFphNvp08cJTSdb/ZFnQln/uxZqgSg4Oq9plTuVqptBCOWjdc?=
 =?us-ascii?Q?7yAIcHTH1WbWNzVNOXoJPOxPY+4+kawjiTBOV8MNzKbsTcjNZf8XsbbjcVfG?=
 =?us-ascii?Q?IEu5GJELAHFznTicXe8rkRYXGkgRusXiqDY3Vb0Xi4/aF7zC5AQjREVgiGDY?=
 =?us-ascii?Q?tu3VZlWFdKcSV1lQeVICR1rh+o7D4WEt8CYXw1Du8kY/wzgMEgWnlwW79Nlh?=
 =?us-ascii?Q?rIPS10EbN+85IQXVcSCQT4UBMfiqyD2UOCRhZCkzVLaNk6Eo5H9+BzsO5z2U?=
 =?us-ascii?Q?T0aEpHHEcAYGzHjLkk3Pib8lb/sxGLtAcDExUdxZ7gWSUXtxP1bbOFWz2YLT?=
 =?us-ascii?Q?ZfdGJgR5/9Lu4cPIMv7SlFA/JRf4yBDG7tXR+SLVZ5LcoJjwG5koE1dzjm46?=
 =?us-ascii?Q?E8Jc/vsiw1ZYrB4cD08d2nsvGmiF7hVCymKljMaGtGyh5QyV+vaFqoaaGy1E?=
 =?us-ascii?Q?GQi3W7AI1f32iUqwxUHvA9npYiig65NRsbd7xXJWWT2f4m7arII/JiRs+JEa?=
 =?us-ascii?Q?kkHHbPJPCCD+6AUDgTE9w6dMBw8PofqZGyfTzQTkx9Q3ZQNFPKqxYpvDFOsy?=
 =?us-ascii?Q?MKg0bWQCt7A8NJ4YA4kiDHnl01cqYFkYfqQmoazOkQAM82C4/4G0OYuw127O?=
 =?us-ascii?Q?bDWMQclaeRq96nIA8FR+TTkA7CZLbqtWIoUta7GzAxC2St/bWV1zf9GBVtHD?=
 =?us-ascii?Q?zM3JPrEEMQhUqOqrPyIlUJG5aQe26Kss68UcI22MejWRwQXMw/nmWLOA3P/Q?=
 =?us-ascii?Q?OP0Zu5iYucoDBKzU+/yvR9hY6rtKrkUqpck6QUaawVex1/XhjbLc48kU/b2j?=
 =?us-ascii?Q?Nw=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 255ac755-44d4-4259-ee6c-08da9f564d3f
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 00:30:24.3072
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 8eUnaYjrUy8ESHHzc1oA+cZx/E4e30BksLQ3u4dAqu3yuS/zqPc4dOXsYKRPaiSikBuYJmGfrhioRnzYxP6eVcNPAiiTvsIliyYQ1ykdPEw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4849
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>
---

v3
    * No change

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 62ce3957abe4..525c6ae898e2 100644
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@ -1237,6 +1237,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