Skip to contentSkip to conversation

Remove clk.h from clk-provider.h (non-clk drivers part)

PATCH In review Stephen Boyd 7 participants 17 messages Jul 10, 2015 – Aug 20, 2015

Subsystems (13)
PowerPC Staging ACPI Library code +9 more subsystems
lore
Share & tools
lore
#0 lore raw

cover Remove clk.h from clk-provider.h (non-clk drivers part)

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 <[email protected]>
Cc Scott Wood <[email protected]>
Cc Anatolij Gustschin <[email protected]>
Cc Sören Brinkmann <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Daniel Mack <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Robert Jarzmik <[email protected]>
Cc Mark Brown <[email protected]>
Cc Michal Simek <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Ken Xue <[email protected]>
Cc Mika Westerberg <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Cc Luc Verhaegen <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc David Herrmann <[email protected]>
Cc Tomi Valkeinen <[email protected]>
Cc Geert Uytterhoeven <[email protected]>

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(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw

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

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

Cc Gerhard Sittig <[email protected]>
Cc Scott Wood <[email protected]>
Cc Anatolij Gustschin <[email protected]>

---

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

 arch/powerpc/platforms/512x/clock-commonclk.c | 1 +
 1 file changed, 1 insertion(+)
arch/powerpc/platforms/512x/clock-commonclk.c +1 -0
index f691bcabd710..c50ea76ba66c 100644
@@ -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>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
maintainer Acked-by on v1 1/7
#2 lore raw

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

Quoted 7 lines · On Fri, 10 Jul 2015 16:03:23 -0700 Stephen Boyd <[email protected]> wrote:

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

Cc Gerhard Sittig <[email protected]>
Cc Scott Wood <[email protected]>
Cc Anatolij Gustschin <[email protected]>
#3 lore raw

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

In reply to Stephen Boyd

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

Cc Sören Brinkmann <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>

---

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(+)
drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c +1 -0
index 5455bf3d5a91..b8e2f611fd47 100644
@@ -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>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
maintainer Acked-by on v1 2/7
#5 lore raw

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

In reply to Stephen Boyd
Quoted 6 lines · Stephen Boyd

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

Cc Sören Brinkmann <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Quoted 7 lines

---

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(+)
#6 lore raw

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

In reply to 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 <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Robert Jarzmik <[email protected]>
Cc Mark Brown <[email protected]>

---

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(-)
drivers/spi/spi-pxa2xx-pci.c +0 -1
index 3cfd4357489a..d19d7f28aecb 100644
@@ -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>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#7 lore raw

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

In reply to Stephen Boyd

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

Cc Michal Simek <[email protected]>
Cc Daniel Lezcano <[email protected]>

---

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(-)
drivers/clocksource/cadence_ttc_timer.c +0 -1
index 510c8a1d37b3..5ea91e3818d0 100644
@@ -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>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#8 lore raw

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

Quoted 9 lines · Stephen Boyd

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

Cc Michal Simek <[email protected]>
Cc Daniel Lezcano <[email protected]>

---

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.

Quoted 15 lines
  drivers/clocksource/cadence_ttc_timer.c | 1 -
  1 file changed, 1 deletion(-)
drivers/clocksource/cadence_ttc_timer.c +0 -1
index 510c8a1d37b3..5ea91e3818d0 100644
@@ -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>
Signature · 5 lines
 <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
#9 lore raw

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

Quoted 8 lines · Daniel Lezcano
Quoted 7 lines · Stephen Boyd

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

Cc Michal Simek <[email protected]>
Cc Daniel Lezcano <[email protected]>

---

Quoted 5 lines
Quoted 2 lines

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.

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
Acked-by on v1 4/7
#10 lore raw

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

In reply to Stephen Boyd
Quoted 6 lines · Stephen Boyd

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

Cc Michal Simek <[email protected]>
Cc Daniel Lezcano <[email protected]>

---

Signature · 5 lines
 <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
#11 lore raw

PATCH 5/7 ACPI: Remove clk.h include

In reply to 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 <[email protected]>
Cc Mika Westerberg <[email protected]>
Cc Rafael J. Wysocki <[email protected]>

---

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(-)
drivers/acpi/acpi_apd.c +0 -1
index 3984ea96e5f7..a450e7af877c 100644
@@ -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"
drivers/acpi/acpi_lpss.c +0 -1
index 569ee090343f..6817b18ed722 100644
@@ -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>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#12 lore raw

PATCH 6/7 simplefb: Include clk.h

In reply to Stephen Boyd

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

Cc Luc Verhaegen <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc David Herrmann <[email protected]>
Cc Tomi Valkeinen <[email protected]>

---

Please ack so this can go through clk-tree.

 drivers/video/fbdev/simplefb.c | 1 +
 1 file changed, 1 insertion(+)
drivers/video/fbdev/simplefb.c +1 -0
index 1085c0432158..52c5c7e63b52 100644
@@ -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>
 
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Acked-by on v1 6/7
#13 lore raw

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

Quoted 10 lines · Stephen Boyd

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

Cc Luc Verhaegen <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc David Herrmann <[email protected]>
Cc Tomi Valkeinen <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

Acked-by on v1 6/7
#14 lore raw

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

In reply to Stephen Boyd
Quoted 10 lines · Stephen Boyd

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

Cc Luc Verhaegen <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc David Herrmann <[email protected]>
Cc Tomi Valkeinen <[email protected]>
Quoted 6 lines

---

Please ack so this can go through clk-tree.

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

Tomi

#15 lore raw

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

In reply to 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 <[email protected]>

---

Please ack so this can go through clk-tree.

 lib/vsprintf.c | 1 +
 1 file changed, 1 insertion(+)
lib/vsprintf.c +1 -0
index da39c608a28c..95cd63b43b99 100644
@@ -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>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Acked-by on v1 7/7
#16 lore raw

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

Quoted 5 lines · 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 <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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