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;
MIME-Version: 1.0
References: <20230714174021.4039807-1-robh@kernel.org> <20230717090601.GA7868@willie-the-truck>
In-Reply-To: <20230717090601.GA7868@willie-the-truck>
From:   Rob Herring <robh@kernel.org>
Date:   Mon, 17 Jul 2023 11:56:25 -0600
Message-ID: <CAL_JsqLgS_xv6N++2dVot5shWAw0Cv9StLW0OdZr_yUhAf29sQ@mail.gmail.com>
Subject: Re: [PATCH] arm64: Explicitly include correct DT includes
To:     Will Deacon <will@kernel.org>
Cc:     Catalin Marinas <catalin.marinas@arm.com>,
        devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jul 17, 2023 at 3:06=E2=80=AFAM Will Deacon <will@kernel.org> wrote=
:
>
> On Fri, Jul 14, 2023 at 11:40:20AM -0600, 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 includ=
e
> > 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.
> >
> > Signed-off-by: Rob Herring <robh@kernel.org>
> > ---
> >  arch/arm64/kernel/cpuidle.c | 2 --
> >  arch/arm64/kernel/pci.c     | 2 --
> >  2 files changed, 4 deletions(-)
> >
> > diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c
> > index d1f68599c29f..f372295207fb 100644
> > --- a/arch/arm64/kernel/cpuidle.c
> > +++ b/arch/arm64/kernel/cpuidle.c
> > @@ -9,8 +9,6 @@
> >  #include <linux/acpi.h>
> >  #include <linux/cpuidle.h>
> >  #include <linux/cpu_pm.h>
> > -#include <linux/of.h>
> > -#include <linux/of_device.h>
> >  #include <linux/psci.h>
>
> I don't grok how dropping 'linux/of.h' follows from the commit message.
> Is it simply not needed by this file?

The motivation is to disentangle of_device.h includes. The fix is
making sure the explicit DT includes match what is used. The result
varies and here none of the DT headers are needed.

Rob