diff options
author | Magnus Damm <damm@opensource.se> | 2012-02-29 08:18:19 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-12 17:19:13 -0400 |
commit | 84c36ffd7c580e1a63d7284e318670b082260118 (patch) | |
tree | b155688ae029d3c66f87e8d401ce76a41993875f /include/linux | |
parent | c953efdbb1b4f6804a476329a2df8bdab3a76019 (diff) |
sh: remove clk_ops
Now when all clk_ops have been renamed it is
safe to rename clk_ops to sh_clk_ops.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/sh_clk.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index 706c005cd4ba..0a9d8f2ac519 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h | |||
@@ -18,9 +18,8 @@ struct clk_mapping { | |||
18 | struct kref ref; | 18 | struct kref ref; |
19 | }; | 19 | }; |
20 | 20 | ||
21 | #define sh_clk_ops clk_ops | ||
22 | 21 | ||
23 | struct clk_ops { | 22 | struct sh_clk_ops { |
24 | #ifdef CONFIG_SH_CLK_CPG_LEGACY | 23 | #ifdef CONFIG_SH_CLK_CPG_LEGACY |
25 | void (*init)(struct clk *clk); | 24 | void (*init)(struct clk *clk); |
26 | #endif | 25 | #endif |
@@ -39,7 +38,7 @@ struct clk { | |||
39 | unsigned short parent_num; /* choose between */ | 38 | unsigned short parent_num; /* choose between */ |
40 | unsigned char src_shift; /* source clock field in the */ | 39 | unsigned char src_shift; /* source clock field in the */ |
41 | unsigned char src_width; /* configuration register */ | 40 | unsigned char src_width; /* configuration register */ |
42 | struct clk_ops *ops; | 41 | struct sh_clk_ops *ops; |
43 | 42 | ||
44 | struct list_head children; | 43 | struct list_head children; |
45 | struct list_head sibling; /* node for children */ | 44 | struct list_head sibling; /* node for children */ |