[PATCH 0/7] Remove clk.h from clk-provider.h (non-clk drivers part)

[PATCH 0/7] Remove clk.h from clk-provider.h (non-clk drivers part)

[Stephen Boyd]

This is the second set in a series of patches that removes
clk.h from clk-provider.h. This allows us to clearly see what
provider drivers are using the consumer API (clk.h) by
checking the includes. Currently clk.h is included by
clk-provider.h even though it doesn't need to so quite a few
clk provider drivers are relying on the implicit include.

Cc: Gerhard Sittig <gsi@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Mark Brown <broonie@kernel.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Ken Xue <Ken.Xue@amd.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Luc Verhaegen <libv@skynet.be>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>

Stephen Boyd (7):
  powerpc/512x: clk: Include clk.h
  staging: clocking-wizard: Include clk.h
  spi: spi-pxa2xx: Remove clk.h include
  clocksource: cadence_ttc: Remove clk-provider.h include
  ACPI: Remove clk.h include
  simplefb: Include clk.h
  lib/vsprintf.c: Include clk.h

 arch/powerpc/platforms/512x/clock-commonclk.c           | 1 +
 drivers/acpi/acpi_apd.c                                 | 1 -
 drivers/acpi/acpi_lpss.c                                | 1 -
 drivers/clocksource/cadence_ttc_timer.c                 | 1 -
 drivers/spi/spi-pxa2xx-pci.c                            | 1 -
 drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c | 1 +
 drivers/video/fbdev/simplefb.c                          | 1 +
 lib/vsprintf.c                                          | 1 +
 8 files changed, 4 insertions(+), 4 deletions(-)

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/7] powerpc/512x: clk: Include clk.h

[Stephen Boyd]

This clock provider uses the consumer API, so include clk.h
explicitly.

Cc: Gerhard Sittig <gsi@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack so this can go through the clk-tree.

 arch/powerpc/platforms/512x/clock-commonclk.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/platforms/512x/clock-commonclk.c b/arch/powerpc/platforms/512x/clock-commonclk.c
index f691bcabd710..c50ea76ba66c 100644
--- a/arch/powerpc/platforms/512x/clock-commonclk.c
+++ b/arch/powerpc/platforms/512x/clock-commonclk.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/bitops.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/device.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 1/7] powerpc/512x: clk: Include clk.h

[Anatolij Gustschin]

On Fri, 10 Jul 2015 16:03:23 -0700
Stephen Boyd <sboyd@codeaurora.org> wrote:

> This clock provider uses the consumer API, so include clk.h
> explicitly.
> 
> Cc: Gerhard Sittig <gsi@denx.de>
> Cc: Scott Wood <scottwood@freescale.com>
> Cc: Anatolij Gustschin <agust@denx.de>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Acked-by:  Anatolij Gustschin <agust@denx.de>

[PATCH 2/7] staging: clocking-wizard: Include clk.h

[Stephen Boyd]

This clock provider uses the consumer API, so include clk.h
explicitly.

Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack so this can go through the clk-tree.

 drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
index 5455bf3d5a91..b8e2f611fd47 100644
--- a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
+++ b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/platform_device.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/slab.h>
 #include <linux/io.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 2/7] staging: clocking-wizard: Include clk.h

[Sören Brinkmann]

On Fri, 2015-07-10 at 04:03PM -0700, Stephen Boyd wrote:
> This clock provider uses the consumer API, so include clk.h
> explicitly.
> 
> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>

	Thanks,
	Sören

Re: [PATCH 2/7] staging: clocking-wizard: Include clk.h

[Greg Kroah-Hartman]

On Fri, Jul 10, 2015 at 04:03:24PM -0700, Stephen Boyd wrote:
> This clock provider uses the consumer API, so include clk.h
> explicitly.
> 
> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> 
> Please ack so this can go through the clk-tree.
> 
>  drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c | 1 +
>  1 file changed, 1 insertion(+)
> 
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

[PATCH 3/7] spi: spi-pxa2xx: Remove clk.h include

[Stephen Boyd]

Clock provider drivers generally shouldn't include clk.h because
it's the consumer API. Remove the include here because this is a
provider driver.

Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack so this can go through the clk tree. Otherwise
it's ok to go through spi tree.

 drivers/spi/spi-pxa2xx-pci.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 3cfd4357489a..d19d7f28aecb 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -7,7 +7,6 @@
 #include <linux/of_device.h>
 #include <linux/module.h>
 #include <linux/spi/pxa2xx_spi.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 
 #include <linux/dmaengine.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 4/7] clocksource: cadence_ttc: Remove clk-provider.h include

[Stephen Boyd]

This file doesn't use the clk provider APIs. Remove the include.

Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack if you want this to go through clk-tree, otherwise
it's ok to take it through the clocksource side.

 drivers/clocksource/cadence_ttc_timer.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index 510c8a1d37b3..5ea91e3818d0 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -16,7 +16,6 @@
  */
 
 #include <linux/clk.h>
-#include <linux/clk-provider.h>
 #include <linux/interrupt.h>
 #include <linux/clockchips.h>
 #include <linux/of_address.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 4/7] clocksource: cadence_ttc: Remove clk-provider.h include

[Daniel Lezcano]

On 07/11/2015 01:03 AM, Stephen Boyd wrote:
> This file doesn't use the clk provider APIs. Remove the include.
>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>
> Please ack if you want this to go through clk-tree, otherwise
> it's ok to take it through the clocksource side.

This patchset touches different parts, so I guess it makes sense I take 
this one through my tree. But if Mike is willing to take it I am ok with 
that.

>   drivers/clocksource/cadence_ttc_timer.c | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
> index 510c8a1d37b3..5ea91e3818d0 100644
> --- a/drivers/clocksource/cadence_ttc_timer.c
> +++ b/drivers/clocksource/cadence_ttc_timer.c
> @@ -16,7 +16,6 @@
>    */
>
>   #include <linux/clk.h>
> -#include <linux/clk-provider.h>
>   #include <linux/interrupt.h>
>   #include <linux/clockchips.h>
>   #include <linux/of_address.h>



-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH 4/7] clocksource: cadence_ttc: Remove clk-provider.h include

[Stephen Boyd]

On 07/16/2015 04:07 AM, Daniel Lezcano wrote:
> On 07/11/2015 01:03 AM, Stephen Boyd wrote:
>> This file doesn't use the clk provider APIs. Remove the include.
>>
>> Cc: Michal Simek <michal.simek@xilinx.com>
>> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
>> ---
>>
>> Please ack if you want this to go through clk-tree, otherwise
>> it's ok to take it through the clocksource side.
>
> This patchset touches different parts, so I guess it makes sense I 
> take this one through my tree. But if Mike is willing to take it I am 
> ok with that.
>

I'm willing to take it through clk-tree with your ack. Or you can take 
it directly. It's not strictly necessary for the larger series.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 4/7] clocksource: cadence_ttc: Remove clk-provider.h include

[Daniel Lezcano]

On 07/11/2015 01:03 AM, Stephen Boyd wrote:
> This file doesn't use the clk provider APIs. Remove the include.
>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>



-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 5/7] ACPI: Remove clk.h include

[Stephen Boyd]

Clock provider drivers generally shouldn't include clk.h because
it's the consumer API. Remove the includes here because these are
provider drivers.

Cc: Ken Xue <Ken.Xue@amd.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack so this can go through clk-tree. Otherwise it's ok
to go through the acpi tree.

 drivers/acpi/acpi_apd.c  | 1 -
 drivers/acpi/acpi_lpss.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index 3984ea96e5f7..a450e7af877c 100644
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -16,7 +16,6 @@
 #include <linux/clkdev.h>
 #include <linux/acpi.h>
 #include <linux/err.h>
-#include <linux/clk.h>
 #include <linux/pm.h>
 
 #include "internal.h"
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 569ee090343f..6817b18ed722 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 6/7] simplefb: Include clk.h

[Stephen Boyd]

This driver uses the consumer API, so include clk.h explicitly
instead of impliclty through the provider API.

Cc: Luc Verhaegen <libv@skynet.be>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack so this can go through clk-tree.

 drivers/video/fbdev/simplefb.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 1085c0432158..52c5c7e63b52 100644
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/platform_data/simplefb.h>
 #include <linux/platform_device.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/of_platform.h>
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 6/7] simplefb: Include clk.h

[Geert Uytterhoeven]

On Sat, Jul 11, 2015 at 1:03 AM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> This driver uses the consumer API, so include clk.h explicitly
> instead of impliclty through the provider API.
>
> Cc: Luc Verhaegen <libv@skynet.be>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: David Herrmann <dh.herrmann@gmail.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

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

Re: [PATCH 6/7] simplefb: Include clk.h

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 697 bytes --]



On 11/07/15 02:03, Stephen Boyd wrote:
> This driver uses the consumer API, so include clk.h explicitly
> instead of impliclty through the provider API.
> 
> Cc: Luc Verhaegen <libv@skynet.be>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: David Herrmann <dh.herrmann@gmail.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> 
> Please ack so this can go through clk-tree.
> 
>  drivers/video/fbdev/simplefb.c | 1 +
>  1 file changed, 1 insertion(+)

Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

 Tomi


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 7/7] lib/vsprintf.c: Include clk.h

[Stephen Boyd]

This file uses the clk API so it should include clk.h directly
instead of indirectly including it through clk-provider.h.

Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack so this can go through clk-tree.

 lib/vsprintf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index da39c608a28c..95cd63b43b99 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdarg.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/module.h>	/* for KSYM_SYMBOL_LEN */
 #include <linux/types.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 7/7] lib/vsprintf.c: Include clk.h

[Geert Uytterhoeven]

On Sat, Jul 11, 2015 at 1:03 AM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> This file uses the clk API so it should include clk.h directly
> instead of indirectly including it through clk-provider.h.
>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

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