linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Boyd <sboyd@codeaurora.org>
To: Mike Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@codeaurora.org>
Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org,
	Peter De Schrijver <pdeschrijver@nvidia.com>,
	Thierry Reding <treding@nvidia.com>
Subject: [PATCH 26/45] clk: tegra: Properly include clk.h
Date: Fri, 10 Jul 2015 16:33:24 -0700	[thread overview]
Message-ID: <1436571223-10959-27-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1436571223-10959-1-git-send-email-sboyd@codeaurora.org>

Clock provider drivers generally shouldn't include clk.h because
it's the consumer API. Only include clk.h in files that are using
it. Also add in a clkdev.h include that was missing in a file
using clkdev APIs.

Cc: Peter De Schrijver <pdeschrijver@nvidia.com>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/clk/tegra/clk-divider.c          | 1 -
 drivers/clk/tegra/clk-periph-gate.c      | 1 -
 drivers/clk/tegra/clk-periph.c           | 1 -
 drivers/clk/tegra/clk-pll-out.c          | 1 -
 drivers/clk/tegra/clk-pll.c              | 2 +-
 drivers/clk/tegra/clk-super.c            | 1 -
 drivers/clk/tegra/clk-tegra-audio.c      | 1 -
 drivers/clk/tegra/clk-tegra-fixed.c      | 1 -
 drivers/clk/tegra/clk-tegra-periph.c     | 1 -
 drivers/clk/tegra/clk-tegra-pmc.c        | 1 -
 drivers/clk/tegra/clk-tegra-super-gen4.c | 1 -
 drivers/clk/tegra/clk-tegra114.c         | 2 --
 drivers/clk/tegra/clk-tegra124.c         | 1 -
 drivers/clk/tegra/clk-tegra20.c          | 1 -
 drivers/clk/tegra/clk-tegra30.c          | 1 -
 drivers/clk/tegra/clk.c                  | 1 +
 include/linux/clk/tegra.h                | 3 ++-
 17 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/drivers/clk/tegra/clk-divider.c b/drivers/clk/tegra/clk-divider.c
index 59a5714dfe18..48c83efda4cf 100644
--- a/drivers/clk/tegra/clk-divider.c
+++ b/drivers/clk/tegra/clk-divider.c
@@ -19,7 +19,6 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/clk-provider.h>
-#include <linux/clk.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/tegra/clk-periph-gate.c b/drivers/clk/tegra/clk-periph-gate.c
index 0aa8830ae7cc..d28d6e95020f 100644
--- a/drivers/clk/tegra/clk-periph-gate.c
+++ b/drivers/clk/tegra/clk-periph-gate.c
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/slab.h>
 #include <linux/io.h>
diff --git a/drivers/clk/tegra/clk-periph.c b/drivers/clk/tegra/clk-periph.c
index d84ae49d0e05..ec5b6113b012 100644
--- a/drivers/clk/tegra/clk-periph.c
+++ b/drivers/clk/tegra/clk-periph.c
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/export.h>
 #include <linux/slab.h>
diff --git a/drivers/clk/tegra/clk-pll-out.c b/drivers/clk/tegra/clk-pll-out.c
index 3598987a451d..257cae0c1488 100644
--- a/drivers/clk/tegra/clk-pll-out.c
+++ b/drivers/clk/tegra/clk-pll-out.c
@@ -20,7 +20,6 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/clk-provider.h>
-#include <linux/clk.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
index 05c6d08a6695..63499c461482 100644
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
@@ -18,8 +18,8 @@
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/clk-provider.h>
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/tegra/clk-super.c b/drivers/clk/tegra/clk-super.c
index 2fd924d38606..131d1b5085e2 100644
--- a/drivers/clk/tegra/clk-super.c
+++ b/drivers/clk/tegra/clk-super.c
@@ -20,7 +20,6 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/clk-provider.h>
-#include <linux/clk.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/tegra/clk-tegra-audio.c b/drivers/clk/tegra/clk-tegra-audio.c
index 5c38aab2c5b8..11e3ad7ad7a3 100644
--- a/drivers/clk/tegra/clk-tegra-audio.c
+++ b/drivers/clk/tegra/clk-tegra-audio.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
diff --git a/drivers/clk/tegra/clk-tegra-fixed.c b/drivers/clk/tegra/clk-tegra-fixed.c
index 605676d368eb..da0b5941c89f 100644
--- a/drivers/clk/tegra/clk-tegra-fixed.c
+++ b/drivers/clk/tegra/clk-tegra-fixed.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
diff --git a/drivers/clk/tegra/clk-tegra-periph.c b/drivers/clk/tegra/clk-tegra-periph.c
index 46af9244ba74..cb6ab830941d 100644
--- a/drivers/clk/tegra/clk-tegra-periph.c
+++ b/drivers/clk/tegra/clk-tegra-periph.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/of.h>
diff --git a/drivers/clk/tegra/clk-tegra-pmc.c b/drivers/clk/tegra/clk-tegra-pmc.c
index 08b21c1ee867..91377abfefa1 100644
--- a/drivers/clk/tegra/clk-tegra-pmc.c
+++ b/drivers/clk/tegra/clk-tegra-pmc.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/of.h>
diff --git a/drivers/clk/tegra/clk-tegra-super-gen4.c b/drivers/clk/tegra/clk-tegra-super-gen4.c
index feb3201c85ce..ecd7ff736b74 100644
--- a/drivers/clk/tegra/clk-tegra-super-gen4.c
+++ b/drivers/clk/tegra/clk-tegra-super-gen4.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c
index 8237d16b4075..db5871519bf5 100644
--- a/drivers/clk/tegra/clk-tegra114.c
+++ b/drivers/clk/tegra/clk-tegra114.c
@@ -15,9 +15,7 @@
  */
 
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
-#include <linux/clkdev.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/delay.h>
diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c
index e8cca3eac007..0c44cc7f8558 100644
--- a/drivers/clk/tegra/clk-tegra124.c
+++ b/drivers/clk/tegra/clk-tegra124.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/of.h>
diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c
index 41272dcc9e22..bf004f0e4f65 100644
--- a/drivers/clk/tegra/clk-tegra20.c
+++ b/drivers/clk/tegra/clk-tegra20.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/of.h>
diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c
index 0af3e834dd24..fad561a5896b 100644
--- a/drivers/clk/tegra/clk-tegra30.c
+++ b/drivers/clk/tegra/clk-tegra30.c
@@ -16,7 +16,6 @@
 
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/of.h>
diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c
index 41cd87c67be6..22aa8b18c840 100644
--- a/drivers/clk/tegra/clk.c
+++ b/drivers/clk/tegra/clk.c
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/clkdev.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/of.h>
diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h
index 19c4208f4752..57bf7aab4516 100644
--- a/include/linux/clk/tegra.h
+++ b/include/linux/clk/tegra.h
@@ -17,7 +17,8 @@
 #ifndef __LINUX_CLK_TEGRA_H_
 #define __LINUX_CLK_TEGRA_H_
 
-#include <linux/clk.h>
+#include <linux/types.h>
+#include <linux/bug.h>
 
 /*
  * Tegra CPU clock and reset control ops
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project


  parent reply	other threads:[~2015-07-10 23:38 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-10 23:32 [PATCH 00/45] Remove clk.h from clk-provider.h (clk drivers part) Stephen Boyd
2015-07-10 23:32 ` [PATCH 01/45] clk: axi-clkgen: Remove clk.h include Stephen Boyd
2015-07-10 23:33 ` [PATCH 02/45] clk: cdce706: Include clk.h Stephen Boyd
2015-07-10 23:33 ` [PATCH 03/45] clk: clps711x: Remove clk.h include Stephen Boyd
2015-07-10 23:33 ` [PATCH 04/45] clk: efm32gg: " Stephen Boyd
2015-07-11 17:24   ` Uwe Kleine-König
2015-07-10 23:33 ` [PATCH 05/45] clk: mux: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 06/45] clk: nomadik: Remove clk.h and clkdev.h includes Stephen Boyd
2015-07-16 13:27   ` Linus Walleij
2015-07-10 23:33 ` [PATCH 07/45] clk: palmas: Remove " Stephen Boyd
2015-07-10 23:33 ` [PATCH 08/45] clk: rk808: Remove clk.h include Stephen Boyd
2015-07-10 23:33 ` [PATCH 09/45] clk: si5351: Include clk.h Stephen Boyd
2015-07-10 23:33 ` [PATCH 10/45] clk: twl6040: Remove clk.h include Stephen Boyd
2015-07-10 23:33 ` [PATCH 11/45] clk: u300: " Stephen Boyd
2015-07-16 13:28   ` Linus Walleij
2015-07-10 23:33 ` [PATCH 12/45] clk: wm831x: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 13/45] clk: hisilicon: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 14/45] clk: keystone: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 15/45] clk: mediatek: Properly include clk.h Stephen Boyd
2015-07-10 23:33 ` [PATCH 16/45] clk: meson8b: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 17/45] clk: mmp: Remove clk.h include Stephen Boyd
2015-07-10 23:33 ` [PATCH 18/45] clk: mvebu: " Stephen Boyd
2015-07-20  8:39   ` Boris Brezillon
2015-07-10 23:33 ` [PATCH 19/45] clk: mxs: Include clk.h in C files that use it Stephen Boyd
2015-07-12  2:47   ` Shawn Guo
2015-07-10 23:33 ` [PATCH 20/45] clk: nxp: Remove clk.h include Stephen Boyd
2015-07-11  7:24   ` Joachim Eastwood
2015-07-10 23:33 ` [PATCH 21/45] clk: rockchip: Properly include clk.h Stephen Boyd
2015-07-10 23:33 ` [PATCH 22/45] clk: samsung: Properly include clk.h and clkdev.h Stephen Boyd
2015-07-11  7:07   ` Krzysztof Kozlowski
2015-07-13 20:42     ` Stephen Boyd
2015-07-13 23:46       ` Krzysztof Kozlowski
2015-07-18 18:06       ` Paul Gortmaker
2015-07-10 23:33 ` [PATCH 23/45] clk: sirf: Properly include clk.h Stephen Boyd
2015-07-10 23:33 ` [PATCH 24/45] clk: socfpga: Remove clk.h and clkdev.h includes Stephen Boyd
2015-07-13 16:01   ` Dinh Nguyen
2015-07-10 23:33 ` [PATCH 25/45] clk: socfpga: Remove clk.h include Stephen Boyd
2015-07-13  2:33   ` Viresh Kumar
2015-07-10 23:33 ` Stephen Boyd [this message]
2015-07-10 23:33 ` [PATCH 27/45] clk: ux500: Remove clk.h and clkdev.h includes Stephen Boyd
2015-07-16 13:29   ` Linus Walleij
2015-07-20 11:21   ` Ulf Hansson
2015-07-10 23:33 ` [PATCH 28/45] clk: versatile: " Stephen Boyd
2015-07-16 13:28   ` Linus Walleij
2015-07-10 23:33 ` [PATCH 29/45] clk: bcm: Include clk.h Stephen Boyd
2015-07-13 12:44   ` Alex Elder
2015-07-10 23:33 ` [PATCH 30/45] clk: highbank: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 31/45] clk: qcom: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 32/45] clk: st: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 33/45] clk: sunxi: " Stephen Boyd
2015-07-20  8:01   ` Maxime Ripard
2015-07-20 18:01     ` Stephen Boyd
2015-07-27  7:33       ` Maxime Ripard
2015-07-10 23:33 ` [PATCH 34/45] clk: ti: " Stephen Boyd
2015-07-13  9:38   ` Tero Kristo
2015-07-10 23:33 ` [PATCH 35/45] clk: zynq: " Stephen Boyd
2015-07-13 16:54   ` Sören Brinkmann
2015-07-10 23:33 ` [PATCH 36/45] clk: Include clk.h in clk.c Stephen Boyd
2015-07-10 23:33 ` [PATCH 37/45] clk: cdce925: Include clk.h Stephen Boyd
2015-07-10 23:33 ` [PATCH 38/45] clk: moxart: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 39/45] clk: si570: " Stephen Boyd
2015-07-13 16:55   ` Sören Brinkmann
2015-07-10 23:33 ` [PATCH 40/45] clk: ingenic: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 41/45] clk: pistachio: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 42/45] clk: samsung: s5pv210-audss: " Stephen Boyd
2015-07-10 23:33 ` [PATCH 43/45] clk: ti: Switch clk-provider.h include to clk.h Stephen Boyd
2015-07-13  9:38   ` Tero Kristo
2015-07-10 23:33 ` [PATCH 44/45] clk: at91: Include clk.h and slab.h Stephen Boyd
2015-07-20  8:36   ` Boris Brezillon
2015-07-10 23:33 ` [PATCH 45/45] clk: Remove clk.h from clk-provider.h Stephen Boyd
2015-07-18 18:17   ` Paul Gortmaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1436571223-10959-27-git-send-email-sboyd@codeaurora.org \
    --to=sboyd@codeaurora.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=pdeschrijver@nvidia.com \
    --cc=treding@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).