From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7173CC00528 for ; Fri, 14 Jul 2023 17:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236307AbjGNRvt (ORCPT ); Fri, 14 Jul 2023 13:51:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236475AbjGNRvl (ORCPT ); Fri, 14 Jul 2023 13:51:41 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B255E1BD4; Fri, 14 Jul 2023 10:51:19 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-52165886aa3so934587a12.3; Fri, 14 Jul 2023 10:51:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689356969; x=1691948969; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=NC5d4RwQCfp8AlIqPrzhfVbCgr0HcM0nwsYSbXqAxYE=; b=rx2n/DUK5FdpNhorZRwEEki+42neY7ZsFn7dxJ+w0dyX+eW6z/W9Cq8sQP3V25FJXa NFR58sOyCNYM/GahvZZlMRrwvVhJvBjYDMF7yAJc4BJyZ09MXKfyt/HyoqeocODycsed p5E877/Nni8iIJIUcihPYei13XWJlLrzzWbWriWEbLctfyxtmqXWpzvRjUAugkoxNpNi /8BOBWA8iLKwlRv4xWWSiyvmNzozl1ZvC3HJSUGErMYOuKsj8EEerw8L44wdf6RMjNc4 ur9VtTzYlljA3AaPEnC5mwWinmvG0RkK7cbk1q037RdUeo00q58A+wrdT/iN20EbSiGC OUuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689356969; x=1691948969; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NC5d4RwQCfp8AlIqPrzhfVbCgr0HcM0nwsYSbXqAxYE=; b=CyAdwBMqbkZlrWMHit8srEtqQpCohDgLC8yQxDuTLp8HjtxFH4AJVe7IaAZpb/3EOu WVuwNt1f0lCZjsDlMA5I/4E6pMVyDx+kfkt3kWN7RWVtENMelX1MEQ4Pl4yta0HK6I5K qjiO9sc9Ainb8HmGY9dww/u8G+ZeJrFBo1xyS+OtvtrmT/LfT83ZG+KmBox45Zv6YPsl UBIhzit7FctOrEyP29GHBagBJCCnGUnJtZdFqx2RN6mPe7Ln2B4PPjfw4gG5hcxmKoRm k5Sw1oeXje4zRhkPfXNSkvDIlnPfeQkNXfRIUswZCpxc2QKmTMiauKhH/PYT2u3o60dy PWag== X-Gm-Message-State: ABy/qLbjg7vSdKk5XcVdvIP0Dks5ifiJmgr40MEIE4h4j2v+2V0c0t5c 9ySfZkotBwUV0UOGZiYMWKofmKXozA4xDw8o+/Y= X-Google-Smtp-Source: APBJJlFfwFHwFk6noFrNZTWL+rppCw3afvIqC7GbXmVZFCFZjgyllSTZfCfNmb5FV0WLuiayOxJ87gfTFd1wpfViDLQ= X-Received: by 2002:a17:906:7484:b0:994:1806:fb96 with SMTP id e4-20020a170906748400b009941806fb96mr4552864ejl.16.1689356969312; Fri, 14 Jul 2023 10:49:29 -0700 (PDT) MIME-Version: 1.0 References: <20230714174525.4055475-1-robh@kernel.org> In-Reply-To: <20230714174525.4055475-1-robh@kernel.org> From: Andy Shevchenko Date: Fri, 14 Jul 2023 20:48:52 +0300 Message-ID: Subject: Re: [PATCH] gpio: Explicitly include correct DT includes To: Rob Herring Cc: Alban Bedel , Linus Walleij , Bartosz Golaszewski , Andy Shevchenko , Doug Berger , Broadcom internal kernel review list , Eugeniy Paltsev , Orson Zhai , Baolin Wang , Chunyan Zhang , Daniel Palmer , Romain Perier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Grygorii Strashko , Santosh Shilimkar , Kevin Hilman , Robert Jarzmik , Heiko Stuebner , Thierry Reding , Jonathan Hunter , Kunihiko Hayashi , Masami Hiramatsu , Shubhrajyoti Datta , Srinivas Neeli , Michal Simek , Nandor Han , devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-tegra@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org On Fri, Jul 14, 2023 at 8:45=E2=80=AFPM Rob Herring wrote= : > > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it as merged into the regular platform bus. > As part of that merge prepping Arm DT support 13 years ago, they > "temporarily" include each other. They also include platform_device.h > and of.h. As a result, there's a pretty much random mix of those include > files used throughout the tree. In order to detangle these headers and > replace the implicit includes with struct declarations, users need to > explicitly include the correct includes. At least this makes GPIO drivers close to being agnostic. Reviewed-by: Andy Shevchenko > Signed-off-by: Rob Herring > --- > drivers/gpio/gpio-ath79.c | 3 ++- > drivers/gpio/gpio-brcmstb.c | 4 ++-- > drivers/gpio/gpio-creg-snps.c | 2 +- > drivers/gpio/gpio-eic-sprd.c | 2 +- > drivers/gpio/gpio-ge.c | 2 +- > drivers/gpio/gpio-grgpio.c | 2 +- > drivers/gpio/gpio-hlwd.c | 2 +- > drivers/gpio/gpio-logicvc.c | 1 - > drivers/gpio/gpio-mb86s7x.c | 2 +- > drivers/gpio/gpio-mpc5200.c | 2 +- > drivers/gpio/gpio-mpc8xxx.c | 4 +--- > drivers/gpio/gpio-msc313.c | 1 - > drivers/gpio/gpio-mxc.c | 1 - > drivers/gpio/gpio-mxs.c | 1 - > drivers/gpio/gpio-omap.c | 1 - > drivers/gpio/gpio-palmas.c | 1 - > drivers/gpio/gpio-pmic-eic-sprd.c | 2 +- > drivers/gpio/gpio-pxa.c | 1 - > drivers/gpio/gpio-rcar.c | 1 - > drivers/gpio/gpio-rockchip.c | 2 +- > drivers/gpio/gpio-sprd.c | 2 +- > drivers/gpio/gpio-stp-xway.c | 3 ++- > drivers/gpio/gpio-syscon.c | 1 - > drivers/gpio/gpio-tegra.c | 2 +- > drivers/gpio/gpio-tegra186.c | 2 +- > drivers/gpio/gpio-tps6586x.c | 2 +- > drivers/gpio/gpio-tps65910.c | 2 +- > drivers/gpio/gpio-ts4800.c | 3 +-- > drivers/gpio/gpio-ts4900.c | 2 +- > drivers/gpio/gpio-uniphier.c | 1 - > drivers/gpio/gpio-vf610.c | 1 - > drivers/gpio/gpio-wcd934x.c | 3 ++- > drivers/gpio/gpio-xilinx.c | 4 ++-- > drivers/gpio/gpio-xra1403.c | 2 +- > 34 files changed, 28 insertions(+), 39 deletions(-) > > diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c > index aa0a954b8392..f0c0c0f77eb0 100644 > --- a/drivers/gpio/gpio-ath79.c > +++ b/drivers/gpio/gpio-ath79.c > @@ -9,8 +9,9 @@ > */ > > #include > +#include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c > index 6566517fe0d8..bccdbfd5ec80 100644 > --- a/drivers/gpio/gpio-brcmstb.c > +++ b/drivers/gpio/gpio-brcmstb.c > @@ -3,12 +3,12 @@ > > #include > #include > -#include > -#include > +#include > #include > #include > #include > #include > +#include > > enum gio_reg_index { > GIO_REG_ODEN =3D 0, > diff --git a/drivers/gpio/gpio-creg-snps.c b/drivers/gpio/gpio-creg-snps.= c > index 789384c6e178..4968232f70f2 100644 > --- a/drivers/gpio/gpio-creg-snps.c > +++ b/drivers/gpio/gpio-creg-snps.c > @@ -8,7 +8,7 @@ > #include > #include > #include > -#include > +#include > > #define MAX_GPIO 32 > > diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c > index 84352a6f4973..67b1e09e8985 100644 > --- a/drivers/gpio/gpio-eic-sprd.c > +++ b/drivers/gpio/gpio-eic-sprd.c > @@ -9,7 +9,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c > index 7bd4c2a4cc11..4eecbc862abc 100644 > --- a/drivers/gpio/gpio-ge.c > +++ b/drivers/gpio/gpio-ge.c > @@ -20,7 +20,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c > index bea0e32c195d..0163c95f6dd7 100644 > --- a/drivers/gpio/gpio-grgpio.c > +++ b/drivers/gpio/gpio-grgpio.c > @@ -19,10 +19,10 @@ > #include > #include > #include > +#include > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-hlwd.c b/drivers/gpio/gpio-hlwd.c > index c208ac1c54a6..1bcfc1835dae 100644 > --- a/drivers/gpio/gpio-hlwd.c > +++ b/drivers/gpio/gpio-hlwd.c > @@ -10,7 +10,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > diff --git a/drivers/gpio/gpio-logicvc.c b/drivers/gpio/gpio-logicvc.c > index 992cc958a43f..2b9876bc1383 100644 > --- a/drivers/gpio/gpio-logicvc.c > +++ b/drivers/gpio/gpio-logicvc.c > @@ -8,7 +8,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-mb86s7x.c b/drivers/gpio/gpio-mb86s7x.c > index 37c5363e391e..ca7eb5e8bfaa 100644 > --- a/drivers/gpio/gpio-mb86s7x.c > +++ b/drivers/gpio/gpio-mb86s7x.c > @@ -10,11 +10,11 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-mpc5200.c b/drivers/gpio/gpio-mpc5200.c > index 3b0bfff8c778..b49e3ca64015 100644 > --- a/drivers/gpio/gpio-mpc5200.c > +++ b/drivers/gpio/gpio-mpc5200.c > @@ -10,7 +10,7 @@ > #include > #include > #include > -#include > +#include > #include > > #include > diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c > index 5979a36bf754..ebf2f511df59 100644 > --- a/drivers/gpio/gpio-mpc8xxx.c > +++ b/drivers/gpio/gpio-mpc8xxx.c > @@ -9,12 +9,10 @@ > #include > #include > #include > +#include > #include > #include > #include > -#include > -#include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-msc313.c b/drivers/gpio/gpio-msc313.c > index 036ad2324892..2f448eb23abb 100644 > --- a/drivers/gpio/gpio-msc313.c > +++ b/drivers/gpio/gpio-msc313.c > @@ -6,7 +6,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c > index 9d0cec4b82a3..9d16371151d5 100644 > --- a/drivers/gpio/gpio-mxc.c > +++ b/drivers/gpio/gpio-mxc.c > @@ -22,7 +22,6 @@ > #include > #include > #include > -#include > #include > > #define IMX_SCU_WAKEUP_OFF 0 > diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c > index 390e619a2831..8e04c9c4b5a2 100644 > --- a/drivers/gpio/gpio-mxs.c > +++ b/drivers/gpio/gpio-mxs.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c > index a08be5bf6808..2b78fde74e30 100644 > --- a/drivers/gpio/gpio-omap.c > +++ b/drivers/gpio/gpio-omap.c > @@ -22,7 +22,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c > index bac10c2faf56..6140e87c6754 100644 > --- a/drivers/gpio/gpio-palmas.c > +++ b/drivers/gpio/gpio-palmas.c > @@ -12,7 +12,6 @@ > #include > #include > #include > -#include > #include > > struct palmas_gpio { > diff --git a/drivers/gpio/gpio-pmic-eic-sprd.c b/drivers/gpio/gpio-pmic-e= ic-sprd.c > index c3e4d90f6b18..dabb0da3bd33 100644 > --- a/drivers/gpio/gpio-pmic-eic-sprd.c > +++ b/drivers/gpio/gpio-pmic-eic-sprd.c > @@ -8,7 +8,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c > index a1630ed4b741..7e9f7a32d3ee 100644 > --- a/drivers/gpio/gpio-pxa.c > +++ b/drivers/gpio/gpio-pxa.c > @@ -20,7 +20,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c > index 2525adb52f4f..86e69cde04da 100644 > --- a/drivers/gpio/gpio-rcar.c > +++ b/drivers/gpio/gpio-rcar.c > @@ -15,7 +15,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c > index e5de15a2ab9a..b35b9604413f 100644 > --- a/drivers/gpio/gpio-rockchip.c > +++ b/drivers/gpio/gpio-rockchip.c > @@ -17,10 +17,10 @@ > #include > #include > #include > -#include > #include > #include > #include > +#include > #include > > #include "../pinctrl/core.h" > diff --git a/drivers/gpio/gpio-sprd.c b/drivers/gpio/gpio-sprd.c > index 072b4e653216..c117c11bfb29 100644 > --- a/drivers/gpio/gpio-sprd.c > +++ b/drivers/gpio/gpio-sprd.c > @@ -7,8 +7,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > > diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c > index 4750ea34204c..053d616f2e02 100644 > --- a/drivers/gpio/gpio-stp-xway.c > +++ b/drivers/gpio/gpio-stp-xway.c > @@ -4,11 +4,12 @@ > * Copyright (C) 2012 John Crispin > */ > > +#include > #include > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c > index 6076937b18e7..41bf47c8c983 100644 > --- a/drivers/gpio/gpio-syscon.c > +++ b/drivers/gpio/gpio-syscon.c > @@ -9,7 +9,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c > index 5b265a6fd3c1..ea715582bcf3 100644 > --- a/drivers/gpio/gpio-tegra.c > +++ b/drivers/gpio/gpio-tegra.c > @@ -15,7 +15,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c > index 80d08ddde40e..d87dd06db40d 100644 > --- a/drivers/gpio/gpio-tegra186.c > +++ b/drivers/gpio/gpio-tegra186.c > @@ -11,7 +11,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c > index c5713524b581..d277aa951143 100644 > --- a/drivers/gpio/gpio-tps6586x.c > +++ b/drivers/gpio/gpio-tps6586x.c > @@ -15,7 +15,7 @@ > #include > #include > #include > -#include > +#include > #include > > /* GPIO control registers */ > diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c > index 321e6945f0be..187d21580573 100644 > --- a/drivers/gpio/gpio-tps65910.c > +++ b/drivers/gpio/gpio-tps65910.c > @@ -15,7 +15,7 @@ > #include > #include > #include > -#include > +#include > > struct tps65910_gpio { > struct gpio_chip gpio_chip; > diff --git a/drivers/gpio/gpio-ts4800.c b/drivers/gpio/gpio-ts4800.c > index 95d80ba14bee..4748e3d47106 100644 > --- a/drivers/gpio/gpio-ts4800.c > +++ b/drivers/gpio/gpio-ts4800.c > @@ -7,8 +7,7 @@ > > #include > #include > -#include > -#include > +#include > #include > > #define DEFAULT_PIN_NUMBER 16 > diff --git a/drivers/gpio/gpio-ts4900.c b/drivers/gpio/gpio-ts4900.c > index eba96319dac2..0f6397b77c9d 100644 > --- a/drivers/gpio/gpio-ts4900.c > +++ b/drivers/gpio/gpio-ts4900.c > @@ -8,7 +8,7 @@ > > #include > #include > -#include > +#include > #include > #include > > diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c > index 19ce6675cbc0..9725b7aa18a7 100644 > --- a/drivers/gpio/gpio-uniphier.c > +++ b/drivers/gpio/gpio-uniphier.c > @@ -9,7 +9,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c > index d3f3a69d4907..54e7c51f48c8 100644 > --- a/drivers/gpio/gpio-vf610.c > +++ b/drivers/gpio/gpio-vf610.c > @@ -17,7 +17,6 @@ > #include > #include > #include > -#include > #include > #include > > diff --git a/drivers/gpio/gpio-wcd934x.c b/drivers/gpio/gpio-wcd934x.c > index 817750e4e033..2bba27b13947 100644 > --- a/drivers/gpio/gpio-wcd934x.c > +++ b/drivers/gpio/gpio-wcd934x.c > @@ -1,11 +1,12 @@ > // SPDX-License-Identifier: GPL-2.0 > // Copyright (c) 2019, Linaro Limited > > +#include > #include > #include > +#include > #include > #include > -#include > > #define WCD_PIN_MASK(p) BIT(p) > #define WCD_REG_DIR_CTL_OFFSET 0x42 > diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c > index 1fa66f2a667f..a16945e8319e 100644 > --- a/drivers/gpio/gpio-xilinx.c > +++ b/drivers/gpio/gpio-xilinx.c > @@ -15,8 +15,8 @@ > #include > #include > #include > -#include > -#include > +#include > +#include > #include > #include > > diff --git a/drivers/gpio/gpio-xra1403.c b/drivers/gpio/gpio-xra1403.c > index bbc06cdd9634..eed8a1684830 100644 > --- a/drivers/gpio/gpio-xra1403.c > +++ b/drivers/gpio/gpio-xra1403.c > @@ -8,9 +8,9 @@ > #include > #include > #include > +#include > #include > #include > -#include > #include > #include > #include > -- > 2.40.1 > --=20 With Best Regards, Andy Shevchenko