| Message ID | 20230823170438.2489746-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] genpd: Explicitly include correct DT includes | expand |
Dne sreda, 23. avgust 2023 ob 19:04:37 CEST je Rob Herring napisal(a): > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it was 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> > --- > v2: Previously sent for drivers/soc/. Gathered up files which got moved > to genpd to new patch. > --- > drivers/genpd/mediatek/mtk-pm-domains.c | 2 +- > drivers/genpd/mediatek/mtk-scpsys.c | 2 +- > drivers/genpd/sunxi/sun20i-ppu.c | 2 +- for sun20i-ppu: Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej
On Wed, 23 Aug 2023 at 19:05, Rob Herring <robh@kernel.org> wrote: > > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it was 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> Applied for next, thanks! Kind regards Uffe > --- > v2: Previously sent for drivers/soc/. Gathered up files which got moved > to genpd to new patch. > --- > drivers/genpd/mediatek/mtk-pm-domains.c | 2 +- > drivers/genpd/mediatek/mtk-scpsys.c | 2 +- > drivers/genpd/sunxi/sun20i-ppu.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/genpd/mediatek/mtk-pm-domains.c b/drivers/genpd/mediatek/mtk-pm-domains.c > index 354249cc1b12..ee962804b830 100644 > --- a/drivers/genpd/mediatek/mtk-pm-domains.c > +++ b/drivers/genpd/mediatek/mtk-pm-domains.c > @@ -8,8 +8,8 @@ > #include <linux/io.h> > #include <linux/iopoll.h> > #include <linux/mfd/syscon.h> > +#include <linux/of.h> > #include <linux/of_clk.h> > -#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <linux/regmap.h> > diff --git a/drivers/genpd/mediatek/mtk-scpsys.c b/drivers/genpd/mediatek/mtk-scpsys.c > index 7a668888111c..b374d01fdac7 100644 > --- a/drivers/genpd/mediatek/mtk-scpsys.c > +++ b/drivers/genpd/mediatek/mtk-scpsys.c > @@ -7,7 +7,7 @@ > #include <linux/io.h> > #include <linux/iopoll.h> > #include <linux/mfd/syscon.h> > -#include <linux/of_device.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <linux/regulator/consumer.h> > diff --git a/drivers/genpd/sunxi/sun20i-ppu.c b/drivers/genpd/sunxi/sun20i-ppu.c > index 98cb41d36560..8700f9dd5f75 100644 > --- a/drivers/genpd/sunxi/sun20i-ppu.c > +++ b/drivers/genpd/sunxi/sun20i-ppu.c > @@ -5,7 +5,7 @@ > #include <linux/io.h> > #include <linux/iopoll.h> > #include <linux/module.h> > -#include <linux/of_device.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <linux/reset.h> > -- > 2.40.1 >
diff --git a/drivers/genpd/mediatek/mtk-pm-domains.c b/drivers/genpd/mediatek/mtk-pm-domains.c index 354249cc1b12..ee962804b830 100644 --- a/drivers/genpd/mediatek/mtk-pm-domains.c +++ b/drivers/genpd/mediatek/mtk-pm-domains.c @@ -8,8 +8,8 @@ #include <linux/io.h> #include <linux/iopoll.h> #include <linux/mfd/syscon.h> +#include <linux/of.h> #include <linux/of_clk.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/regmap.h> diff --git a/drivers/genpd/mediatek/mtk-scpsys.c b/drivers/genpd/mediatek/mtk-scpsys.c index 7a668888111c..b374d01fdac7 100644 --- a/drivers/genpd/mediatek/mtk-scpsys.c +++ b/drivers/genpd/mediatek/mtk-scpsys.c @@ -7,7 +7,7 @@ #include <linux/io.h> #include <linux/iopoll.h> #include <linux/mfd/syscon.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/regulator/consumer.h> diff --git a/drivers/genpd/sunxi/sun20i-ppu.c b/drivers/genpd/sunxi/sun20i-ppu.c index 98cb41d36560..8700f9dd5f75 100644 --- a/drivers/genpd/sunxi/sun20i-ppu.c +++ b/drivers/genpd/sunxi/sun20i-ppu.c @@ -5,7 +5,7 @@ #include <linux/io.h> #include <linux/iopoll.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/reset.h>
The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it was 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> --- v2: Previously sent for drivers/soc/. Gathered up files which got moved to genpd to new patch. --- drivers/genpd/mediatek/mtk-pm-domains.c | 2 +- drivers/genpd/mediatek/mtk-scpsys.c | 2 +- drivers/genpd/sunxi/sun20i-ppu.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)