From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/10] clk: declare clk_ops of basic clks in clk-provider.h
Date: Tue, 27 Mar 2012 15:23:23 +0800 [thread overview]
Message-ID: <1332833009-4121-5-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1332833009-4121-1-git-send-email-shawn.guo@linaro.org>
Besides the static initialization, the clk_ops of basic clks could
also be used by particular clk type being subclass of the basic clks.
For example, clk_busy_divider has the same clk_ops as clk_divider,
except it has to wait for a busy bit before return success with
.set_rate. clk_busy_divider will somehow reuse clk_ops of clk_divider.
Since clk-provider.h is included by clk-private.h, it's safe to move
those clk_ops declaration of basic clks form clk-private.h into
clk-provider.h, so that implementation of clks like clk_busy_divider
above do not need to include clk-private.h to access those clk_ops.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
include/linux/clk-private.h | 8 --------
include/linux/clk-provider.h | 4 ++++
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index 5f4ccd7..f19fee0 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -55,8 +55,6 @@ struct clk {
* alternative macro for static initialization
*/
-extern const struct clk_ops clk_fixed_rate_ops;
-
#define DEFINE_CLK_FIXED_RATE(_name, _flags, _rate, \
_fixed_rate_flags) \
static struct clk _name; \
@@ -78,8 +76,6 @@ extern const struct clk_ops clk_fixed_rate_ops;
.flags = _flags, \
};
-extern const struct clk_ops clk_gate_ops;
-
#define DEFINE_CLK_GATE(_name, _parent_name, _parent_ptr, \
_flags, _reg, _bit_idx, \
_gate_flags, _lock) \
@@ -110,8 +106,6 @@ extern const struct clk_ops clk_gate_ops;
.flags = _flags, \
};
-extern const struct clk_ops clk_divider_ops;
-
#define DEFINE_CLK_DIVIDER(_name, _parent_name, _parent_ptr, \
_flags, _reg, _shift, _width, \
_divider_flags, _lock) \
@@ -143,8 +137,6 @@ extern const struct clk_ops clk_divider_ops;
.flags = _flags, \
};
-extern const struct clk_ops clk_mux_ops;
-
#define DEFINE_CLK_MUX(_name, _parent_names, _parents, _flags, \
_reg, _shift, _width, \
_mux_flags, _lock) \
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 5508897..6eb8e5d 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -149,6 +149,7 @@ struct clk_fixed_rate {
u8 flags;
};
+extern const struct clk_ops clk_fixed_rate_ops;
struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
const char *parent_name, unsigned long flags,
unsigned long fixed_rate);
@@ -180,6 +181,7 @@ struct clk_gate {
#define CLK_GATE_SET_TO_DISABLE BIT(0)
+extern const struct clk_ops clk_gate_ops;
struct clk *clk_register_gate(struct device *dev, const char *name,
const char *parent_name, unsigned long flags,
void __iomem *reg, u8 bit_idx,
@@ -218,6 +220,7 @@ struct clk_divider {
#define CLK_DIVIDER_ONE_BASED BIT(0)
#define CLK_DIVIDER_POWER_OF_TWO BIT(1)
+extern const struct clk_ops clk_divider_ops;
struct clk *clk_register_divider(struct device *dev, const char *name,
const char *parent_name, unsigned long flags,
void __iomem *reg, u8 shift, u8 width,
@@ -252,6 +255,7 @@ struct clk_mux {
#define CLK_MUX_INDEX_ONE BIT(0)
#define CLK_MUX_INDEX_BIT BIT(1)
+extern const struct clk_ops clk_mux_ops;
struct clk *clk_register_mux(struct device *dev, const char *name,
char **parent_names, u8 num_parents, unsigned long flags,
void __iomem *reg, u8 shift, u8 width,
--
1.7.5.4
next prev parent reply other threads:[~2012-03-27 7:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-27 7:23 [PATCH 00/10] clk: cleanup on basic clks Shawn Guo
2012-03-27 7:23 ` [PATCH 01/10] clk: use kzalloc in clk_register_mux Shawn Guo
2012-03-27 23:31 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 02/10] clk: remove unnecessary EXPORT_SYMBOL_GPL Shawn Guo
2012-03-27 7:23 ` [PATCH 03/10] clk: add "const" for clk_ops of basic clks Shawn Guo
2012-03-27 23:29 ` Turquette, Mike
2012-03-27 7:23 ` Shawn Guo [this message]
2012-03-28 21:20 ` [PATCH 04/10] clk: declare clk_ops of basic clks in clk-provider.h Turquette, Mike
2012-03-27 7:23 ` [PATCH 05/10] clk: align error return of basic clks registeration Shawn Guo
2012-03-27 23:28 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 06/10] clk: fixed-rate: Don't open code kstrdup() Shawn Guo
2012-03-27 23:36 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 07/10] clk: Constify parent name arrays Shawn Guo
2012-03-28 1:03 ` Turquette, Mike
2012-03-28 10:07 ` Mark Brown
2012-03-27 7:23 ` [PATCH 08/10] clk: fixed-rate: registration error handling fixup Shawn Guo
2012-03-28 0:31 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 09/10] clk: dynamically allocate parent_names basic clk registration Shawn Guo
2012-03-27 8:55 ` Sascha Hauer
2012-03-27 12:51 ` Shawn Guo
2012-03-27 19:40 ` Sascha Hauer
2012-03-27 23:17 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 10/10] clk: copy parent_names in clk-mux registration Shawn Guo
2012-04-09 22:00 ` Turquette, Mike
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=1332833009-4121-5-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).