| Message ID | 1410511111.31130.4.camel@x220 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 12, 2014 at 3:38 AM, Paul Bolle <pebolle@tiscali.nl> wrote: > The Kconfig symbol ARCH_HAS_OPP became redundant in v3.16: commit > 049d595a4db3 ("PM / OPP: Make OPP invisible to users in Kconfig") > removed the only dependency that used it. Setting it had no effect > anymore. > > So commit 78c5e0bb145d ("PM / OPP: Remove ARCH_HAS_OPP") removed it. For > some reason that commit did not remove all select statements for that > symbol. These statements are useless. Remove them too. > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > --- > Done on top of next-20140912. Tested with git grep only! > > arch/arm/mach-omap2/Kconfig | 5 ----- there can be conflict here: https://patchwork.kernel.org/patch/4857231/ http://marc.info/?l=linux-omap&m=141047815520894&w=2 > arch/arm/mach-shmobile/Kconfig | 1 - > drivers/devfreq/Kconfig | 1 - > 3 files changed, 7 deletions(-) > > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > index 5b103099626d..f138bd33a463 100644 > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -22,7 +22,6 @@ config ARCH_OMAP4 > bool "TI OMAP4" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP > select ARM_CPU_SUSPEND if PM > select ARM_ERRATA_720789 > @@ -41,7 +40,6 @@ config SOC_OMAP5 > bool "TI OMAP5" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARM_CPU_SUSPEND if PM > select ARM_GIC > select HAVE_ARM_SCU if SMP > @@ -53,14 +51,12 @@ config SOC_AM33XX > bool "TI AM33XX" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARM_CPU_SUSPEND if PM > > config SOC_AM43XX > bool "TI AM43x" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARM_GIC > select MACH_OMAP_GENERIC > select MIGHT_HAVE_CACHE_L2X0 > @@ -69,7 +65,6 @@ config SOC_DRA7XX > bool "TI DRA7XX" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARM_CPU_SUSPEND if PM > select ARM_GIC > select HAVE_ARM_ARCH_TIMER > diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig > index 21f457b56c01..f59019dd986e 100644 > --- a/arch/arm/mach-shmobile/Kconfig > +++ b/arch/arm/mach-shmobile/Kconfig > @@ -36,7 +36,6 @@ menuconfig ARCH_SHMOBILE_MULTI > select NO_IOPORT_MAP > select PINCTRL > select ARCH_REQUIRE_GPIOLIB > - select ARCH_HAS_OPP > > if ARCH_SHMOBILE_MULTI > > diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig > index 3dced0a9eae3..2227e9bf3884 100644 > --- a/drivers/devfreq/Kconfig > +++ b/drivers/devfreq/Kconfig > @@ -80,7 +80,6 @@ config ARM_EXYNOS4_BUS_DEVFREQ > config ARM_EXYNOS5_BUS_DEVFREQ > bool "ARM Exynos5250 Bus DEVFREQ Driver" > depends on SOC_EXYNOS5250 > - select ARCH_HAS_OPP > select DEVFREQ_GOV_SIMPLE_ONDEMAND > select PM_OPP > help > -- > 1.9.3 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2014-09-12 at 05:20 -0500, Nishanth Menon wrote: > On Fri, Sep 12, 2014 at 3:38 AM, Paul Bolle <pebolle@tiscali.nl> wrote: > > The Kconfig symbol ARCH_HAS_OPP became redundant in v3.16: commit > > 049d595a4db3 ("PM / OPP: Make OPP invisible to users in Kconfig") > > removed the only dependency that used it. Setting it had no effect > > anymore. > > > > So commit 78c5e0bb145d ("PM / OPP: Remove ARCH_HAS_OPP") removed it. For > > some reason that commit did not remove all select statements for that > > symbol. These statements are useless. Remove them too. > > > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > > --- > > Done on top of next-20140912. Tested with git grep only! > > > > arch/arm/mach-omap2/Kconfig | 5 ----- > > there can be conflict here: > https://patchwork.kernel.org/patch/4857231/ > > http://marc.info/?l=linux-omap&m=141047815520894&w=2 Thanks. > > arch/arm/mach-shmobile/Kconfig | 1 - > > drivers/devfreq/Kconfig | 1 - Were patches submitted for these two files too? If so, we can probably just drop my patch. Paul Bolle
Hi Paul, Rafael, On Fri, Sep 12, 2014 at 12:46 PM, Paul Bolle <pebolle@tiscali.nl> wrote: >> > arch/arm/mach-shmobile/Kconfig | 1 - >> > drivers/devfreq/Kconfig | 1 - > > Were patches submitted for these two files too? If so, we can probably > just drop my patch. Rafael said: "I've queued this up for 3.17, thanks!" http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/274681.html But it's not in -next. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Fri, 2014-09-12 at 13:03 +0200, Geert Uytterhoeven wrote: > Hi Paul, Rafael, > > On Fri, Sep 12, 2014 at 12:46 PM, Paul Bolle <pebolle@tiscali.nl> wrote: > >> > arch/arm/mach-shmobile/Kconfig | 1 - > >> > drivers/devfreq/Kconfig | 1 - > > > > Were patches submitted for these two files too? If so, we can probably > > just drop my patch. > > Rafael said: "I've queued this up for 3.17, thanks!" > > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/274681.html > > But it's not in -next. I think that patch landed as commit 78c5e0bb145d. But for some unknown reason it didn't remove all selects statements for ARCH_HAS_OPP. The odd thing here is that the last select statements I remove in this patch are all to be found in Kconfig files that actually were touched in that commit. Perhaps these select statements were merged back in during conflict resolution. I have no idea. Paul Bolle
On Fri, Sep 12, 2014 at 10:38:31AM +0200, Paul Bolle wrote: > The Kconfig symbol ARCH_HAS_OPP became redundant in v3.16: commit > 049d595a4db3 ("PM / OPP: Make OPP invisible to users in Kconfig") > removed the only dependency that used it. Setting it had no effect > anymore. > > So commit 78c5e0bb145d ("PM / OPP: Remove ARCH_HAS_OPP") removed it. For > some reason that commit did not remove all select statements for that > symbol. These statements are useless. Remove them too. > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > --- > Done on top of next-20140912. Tested with git grep only! Hi Paul, could you break the shmobile portion out into a separate patch for me to take through my renesas tree? I am concerned that taking those changes via a different route will result in conflicts as arch/arm/mach-shmobile/Kconfig is often updated. > arch/arm/mach-omap2/Kconfig | 5 ----- > arch/arm/mach-shmobile/Kconfig | 1 - > drivers/devfreq/Kconfig | 1 - > 3 files changed, 7 deletions(-) > > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > index 5b103099626d..f138bd33a463 100644 > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -22,7 +22,6 @@ config ARCH_OMAP4 > bool "TI OMAP4" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP > select ARM_CPU_SUSPEND if PM > select ARM_ERRATA_720789 > @@ -41,7 +40,6 @@ config SOC_OMAP5 > bool "TI OMAP5" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARM_CPU_SUSPEND if PM > select ARM_GIC > select HAVE_ARM_SCU if SMP > @@ -53,14 +51,12 @@ config SOC_AM33XX > bool "TI AM33XX" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARM_CPU_SUSPEND if PM > > config SOC_AM43XX > bool "TI AM43x" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARM_GIC > select MACH_OMAP_GENERIC > select MIGHT_HAVE_CACHE_L2X0 > @@ -69,7 +65,6 @@ config SOC_DRA7XX > bool "TI DRA7XX" > depends on ARCH_MULTI_V7 > select ARCH_OMAP2PLUS > - select ARCH_HAS_OPP > select ARM_CPU_SUSPEND if PM > select ARM_GIC > select HAVE_ARM_ARCH_TIMER > diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig > index 21f457b56c01..f59019dd986e 100644 > --- a/arch/arm/mach-shmobile/Kconfig > +++ b/arch/arm/mach-shmobile/Kconfig > @@ -36,7 +36,6 @@ menuconfig ARCH_SHMOBILE_MULTI > select NO_IOPORT_MAP > select PINCTRL > select ARCH_REQUIRE_GPIOLIB > - select ARCH_HAS_OPP > > if ARCH_SHMOBILE_MULTI > > diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig > index 3dced0a9eae3..2227e9bf3884 100644 > --- a/drivers/devfreq/Kconfig > +++ b/drivers/devfreq/Kconfig > @@ -80,7 +80,6 @@ config ARM_EXYNOS4_BUS_DEVFREQ > config ARM_EXYNOS5_BUS_DEVFREQ > bool "ARM Exynos5250 Bus DEVFREQ Driver" > depends on SOC_EXYNOS5250 > - select ARCH_HAS_OPP > select DEVFREQ_GOV_SIMPLE_ONDEMAND > select PM_OPP > help > -- > 1.9.3 > >
On Tue, Sep 16, 2014 at 09:09:17AM +0900, Simon Horman wrote: > On Fri, Sep 12, 2014 at 10:38:31AM +0200, Paul Bolle wrote: > > The Kconfig symbol ARCH_HAS_OPP became redundant in v3.16: commit > > 049d595a4db3 ("PM / OPP: Make OPP invisible to users in Kconfig") > > removed the only dependency that used it. Setting it had no effect > > anymore. > > > > So commit 78c5e0bb145d ("PM / OPP: Remove ARCH_HAS_OPP") removed it. For > > some reason that commit did not remove all select statements for that > > symbol. These statements are useless. Remove them too. > > > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > > --- > > Done on top of next-20140912. Tested with git grep only! > > Hi Paul, > > could you break the shmobile portion out into a separate patch > for me to take through my renesas tree? > > I am concerned that taking those changes via a different > route will result in conflicts as arch/arm/mach-shmobile/Kconfig > is often updated. Of course the above comment is redundant if Rafael has already taken this patch. > > > arch/arm/mach-omap2/Kconfig | 5 ----- > > arch/arm/mach-shmobile/Kconfig | 1 - > > drivers/devfreq/Kconfig | 1 - > > 3 files changed, 7 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > > index 5b103099626d..f138bd33a463 100644 > > --- a/arch/arm/mach-omap2/Kconfig > > +++ b/arch/arm/mach-omap2/Kconfig > > @@ -22,7 +22,6 @@ config ARCH_OMAP4 > > bool "TI OMAP4" > > depends on ARCH_MULTI_V7 > > select ARCH_OMAP2PLUS > > - select ARCH_HAS_OPP > > select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP > > select ARM_CPU_SUSPEND if PM > > select ARM_ERRATA_720789 > > @@ -41,7 +40,6 @@ config SOC_OMAP5 > > bool "TI OMAP5" > > depends on ARCH_MULTI_V7 > > select ARCH_OMAP2PLUS > > - select ARCH_HAS_OPP > > select ARM_CPU_SUSPEND if PM > > select ARM_GIC > > select HAVE_ARM_SCU if SMP > > @@ -53,14 +51,12 @@ config SOC_AM33XX > > bool "TI AM33XX" > > depends on ARCH_MULTI_V7 > > select ARCH_OMAP2PLUS > > - select ARCH_HAS_OPP > > select ARM_CPU_SUSPEND if PM > > > > config SOC_AM43XX > > bool "TI AM43x" > > depends on ARCH_MULTI_V7 > > select ARCH_OMAP2PLUS > > - select ARCH_HAS_OPP > > select ARM_GIC > > select MACH_OMAP_GENERIC > > select MIGHT_HAVE_CACHE_L2X0 > > @@ -69,7 +65,6 @@ config SOC_DRA7XX > > bool "TI DRA7XX" > > depends on ARCH_MULTI_V7 > > select ARCH_OMAP2PLUS > > - select ARCH_HAS_OPP > > select ARM_CPU_SUSPEND if PM > > select ARM_GIC > > select HAVE_ARM_ARCH_TIMER > > diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig > > index 21f457b56c01..f59019dd986e 100644 > > --- a/arch/arm/mach-shmobile/Kconfig > > +++ b/arch/arm/mach-shmobile/Kconfig > > @@ -36,7 +36,6 @@ menuconfig ARCH_SHMOBILE_MULTI > > select NO_IOPORT_MAP > > select PINCTRL > > select ARCH_REQUIRE_GPIOLIB > > - select ARCH_HAS_OPP > > > > if ARCH_SHMOBILE_MULTI > > > > diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig > > index 3dced0a9eae3..2227e9bf3884 100644 > > --- a/drivers/devfreq/Kconfig > > +++ b/drivers/devfreq/Kconfig > > @@ -80,7 +80,6 @@ config ARM_EXYNOS4_BUS_DEVFREQ > > config ARM_EXYNOS5_BUS_DEVFREQ > > bool "ARM Exynos5250 Bus DEVFREQ Driver" > > depends on SOC_EXYNOS5250 > > - select ARCH_HAS_OPP > > select DEVFREQ_GOV_SIMPLE_ONDEMAND > > select PM_OPP > > help > > -- > > 1.9.3 > > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 5b103099626d..f138bd33a463 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -22,7 +22,6 @@ config ARCH_OMAP4 bool "TI OMAP4" depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS - select ARCH_HAS_OPP select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP select ARM_CPU_SUSPEND if PM select ARM_ERRATA_720789 @@ -41,7 +40,6 @@ config SOC_OMAP5 bool "TI OMAP5" depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS - select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM select ARM_GIC select HAVE_ARM_SCU if SMP @@ -53,14 +51,12 @@ config SOC_AM33XX bool "TI AM33XX" depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS - select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM config SOC_AM43XX bool "TI AM43x" depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS - select ARCH_HAS_OPP select ARM_GIC select MACH_OMAP_GENERIC select MIGHT_HAVE_CACHE_L2X0 @@ -69,7 +65,6 @@ config SOC_DRA7XX bool "TI DRA7XX" depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS - select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM select ARM_GIC select HAVE_ARM_ARCH_TIMER diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 21f457b56c01..f59019dd986e 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -36,7 +36,6 @@ menuconfig ARCH_SHMOBILE_MULTI select NO_IOPORT_MAP select PINCTRL select ARCH_REQUIRE_GPIOLIB - select ARCH_HAS_OPP if ARCH_SHMOBILE_MULTI diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index 3dced0a9eae3..2227e9bf3884 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -80,7 +80,6 @@ config ARM_EXYNOS4_BUS_DEVFREQ config ARM_EXYNOS5_BUS_DEVFREQ bool "ARM Exynos5250 Bus DEVFREQ Driver" depends on SOC_EXYNOS5250 - select ARCH_HAS_OPP select DEVFREQ_GOV_SIMPLE_ONDEMAND select PM_OPP help
The Kconfig symbol ARCH_HAS_OPP became redundant in v3.16: commit 049d595a4db3 ("PM / OPP: Make OPP invisible to users in Kconfig") removed the only dependency that used it. Setting it had no effect anymore. So commit 78c5e0bb145d ("PM / OPP: Remove ARCH_HAS_OPP") removed it. For some reason that commit did not remove all select statements for that symbol. These statements are useless. Remove them too. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Done on top of next-20140912. Tested with git grep only! arch/arm/mach-omap2/Kconfig | 5 ----- arch/arm/mach-shmobile/Kconfig | 1 - drivers/devfreq/Kconfig | 1 - 3 files changed, 7 deletions(-)