Messages in this thread | | | Date | Mon, 31 Jul 2023 10:53:34 +0200 | From | Neil Armstrong <> | Subject | Re: [PATCH] soc: amlogic: Explicitly include correct DT includes |
| |
On 14/07/2023 19:51, 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. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > drivers/soc/amlogic/meson-canvas.c | 1 + > drivers/soc/amlogic/meson-ee-pwrc.c | 3 +-- > drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 3 +-- > drivers/soc/amlogic/meson-secure-pwrc.c | 2 +- > 4 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c > index 383b0cfc584e..b6e06c4d2117 100644 > --- a/drivers/soc/amlogic/meson-canvas.c > +++ b/drivers/soc/amlogic/meson-canvas.c > @@ -8,6 +8,7 @@ > #include <linux/kernel.h> > #include <linux/mfd/syscon.h> > #include <linux/module.h> > +#include <linux/platform_device.h> > #include <linux/regmap.h> > #include <linux/soc/amlogic/meson-canvas.h> > #include <linux/of_address.h> > diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/soc/amlogic/meson-ee-pwrc.c > index f54acffc83f9..cfb796d40d9d 100644 > --- a/drivers/soc/amlogic/meson-ee-pwrc.c > +++ b/drivers/soc/amlogic/meson-ee-pwrc.c > @@ -4,13 +4,12 @@ > * Author: Neil Armstrong <narmstrong@baylibre.com> > */ > > -#include <linux/of_address.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <linux/bitfield.h> > #include <linux/regmap.h> > #include <linux/mfd/syscon.h> > -#include <linux/of_device.h> > +#include <linux/of.h> > #include <linux/reset-controller.h> > #include <linux/reset.h> > #include <linux/clk.h> > diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > index 5d4f12800d93..33df520eab95 100644 > --- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > +++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > @@ -5,13 +5,12 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > -#include <linux/of_address.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <linux/bitfield.h> > #include <linux/regmap.h> > #include <linux/mfd/syscon.h> > -#include <linux/of_device.h> > +#include <linux/of.h> > #include <linux/reset.h> > #include <linux/clk.h> > #include <linux/module.h> > diff --git a/drivers/soc/amlogic/meson-secure-pwrc.c b/drivers/soc/amlogic/meson-secure-pwrc.c > index 25b4b71df9b8..b994f03380b0 100644 > --- a/drivers/soc/amlogic/meson-secure-pwrc.c > +++ b/drivers/soc/amlogic/meson-secure-pwrc.c > @@ -7,7 +7,7 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include <linux/io.h> > -#include <linux/of_device.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <dt-bindings/power/meson-a1-power.h>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
| |