1 From a501a14e38cc4d8e9c91bb508cdca7032d53f717 Mon Sep 17 00:00:00 2001
2 From: Maxime Ripard <maxime.ripard@free-electrons.com>
3 Date: Fri, 30 Sep 2016 10:05:32 +0200
4 Subject: clk: sunxi-ng: Rename the internal structures
6 Rename the structures meant to be embedded in other structures to make it
7 consistent with the mux structure name
9 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
10 Acked-by: Chen-Yu Tsai <wens@csie.org>
12 drivers/clk/sunxi-ng/ccu_div.h | 6 +++---
13 drivers/clk/sunxi-ng/ccu_frac.c | 12 ++++++------
14 drivers/clk/sunxi-ng/ccu_frac.h | 14 +++++++-------
15 drivers/clk/sunxi-ng/ccu_mp.h | 4 ++--
16 drivers/clk/sunxi-ng/ccu_mult.h | 4 ++--
17 drivers/clk/sunxi-ng/ccu_nk.h | 4 ++--
18 drivers/clk/sunxi-ng/ccu_nkm.h | 6 +++---
19 drivers/clk/sunxi-ng/ccu_nkmp.h | 8 ++++----
20 drivers/clk/sunxi-ng/ccu_nm.h | 6 +++---
21 9 files changed, 32 insertions(+), 32 deletions(-)
23 --- a/drivers/clk/sunxi-ng/ccu_div.h
24 +++ b/drivers/clk/sunxi-ng/ccu_div.h
29 - * struct _ccu_div - Internal divider description
30 + * struct ccu_div_internal - Internal divider description
31 * @shift: Bit offset of the divider in its register
32 * @width: Width of the divider field in its register
33 * @max: Maximum value allowed for that divider. This is the
35 * It is basically a wrapper around the clk_divider functions
39 +struct ccu_div_internal {
43 @@ -78,7 +78,7 @@ struct _ccu_div {
47 - struct _ccu_div div;
48 + struct ccu_div_internal div;
49 struct ccu_mux_internal mux;
50 struct ccu_common common;
52 --- a/drivers/clk/sunxi-ng/ccu_frac.c
53 +++ b/drivers/clk/sunxi-ng/ccu_frac.c
57 bool ccu_frac_helper_is_enabled(struct ccu_common *common,
58 - struct _ccu_frac *cf)
59 + struct ccu_frac_internal *cf)
61 if (!(common->features & CCU_FEATURE_FRACTIONAL))
63 @@ -23,7 +23,7 @@ bool ccu_frac_helper_is_enabled(struct c
66 void ccu_frac_helper_enable(struct ccu_common *common,
67 - struct _ccu_frac *cf)
68 + struct ccu_frac_internal *cf)
72 @@ -38,7 +38,7 @@ void ccu_frac_helper_enable(struct ccu_c
75 void ccu_frac_helper_disable(struct ccu_common *common,
76 - struct _ccu_frac *cf)
77 + struct ccu_frac_internal *cf)
81 @@ -53,7 +53,7 @@ void ccu_frac_helper_disable(struct ccu_
84 bool ccu_frac_helper_has_rate(struct ccu_common *common,
85 - struct _ccu_frac *cf,
86 + struct ccu_frac_internal *cf,
89 if (!(common->features & CCU_FEATURE_FRACTIONAL))
90 @@ -63,7 +63,7 @@ bool ccu_frac_helper_has_rate(struct ccu
93 unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
94 - struct _ccu_frac *cf)
95 + struct ccu_frac_internal *cf)
99 @@ -84,7 +84,7 @@ unsigned long ccu_frac_helper_read_rate(
102 int ccu_frac_helper_set_rate(struct ccu_common *common,
103 - struct _ccu_frac *cf,
104 + struct ccu_frac_internal *cf,
108 --- a/drivers/clk/sunxi-ng/ccu_frac.h
109 +++ b/drivers/clk/sunxi-ng/ccu_frac.h
112 #include "ccu_common.h"
115 +struct ccu_frac_internal {
119 @@ -33,21 +33,21 @@ struct _ccu_frac {
122 bool ccu_frac_helper_is_enabled(struct ccu_common *common,
123 - struct _ccu_frac *cf);
124 + struct ccu_frac_internal *cf);
125 void ccu_frac_helper_enable(struct ccu_common *common,
126 - struct _ccu_frac *cf);
127 + struct ccu_frac_internal *cf);
128 void ccu_frac_helper_disable(struct ccu_common *common,
129 - struct _ccu_frac *cf);
130 + struct ccu_frac_internal *cf);
132 bool ccu_frac_helper_has_rate(struct ccu_common *common,
133 - struct _ccu_frac *cf,
134 + struct ccu_frac_internal *cf,
137 unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
138 - struct _ccu_frac *cf);
139 + struct ccu_frac_internal *cf);
141 int ccu_frac_helper_set_rate(struct ccu_common *common,
142 - struct _ccu_frac *cf,
143 + struct ccu_frac_internal *cf,
146 #endif /* _CCU_FRAC_H_ */
147 --- a/drivers/clk/sunxi-ng/ccu_mp.h
148 +++ b/drivers/clk/sunxi-ng/ccu_mp.h
155 + struct ccu_div_internal m;
156 + struct ccu_div_internal p;
157 struct ccu_mux_internal mux;
158 struct ccu_common common;
160 --- a/drivers/clk/sunxi-ng/ccu_mult.h
161 +++ b/drivers/clk/sunxi-ng/ccu_mult.h
163 #include "ccu_common.h"
167 +struct ccu_mult_internal {
171 @@ -18,7 +18,7 @@ struct _ccu_mult {
175 - struct _ccu_mult mult;
176 + struct ccu_mult_internal mult;
177 struct ccu_mux_internal mux;
178 struct ccu_common common;
180 --- a/drivers/clk/sunxi-ng/ccu_nk.h
181 +++ b/drivers/clk/sunxi-ng/ccu_nk.h
182 @@ -30,8 +30,8 @@ struct ccu_nk {
186 - struct _ccu_mult n;
187 - struct _ccu_mult k;
188 + struct ccu_mult_internal n;
189 + struct ccu_mult_internal k;
191 unsigned int fixed_post_div;
193 --- a/drivers/clk/sunxi-ng/ccu_nkm.h
194 +++ b/drivers/clk/sunxi-ng/ccu_nkm.h
195 @@ -29,9 +29,9 @@ struct ccu_nkm {
199 - struct _ccu_mult n;
200 - struct _ccu_mult k;
202 + struct ccu_mult_internal n;
203 + struct ccu_mult_internal k;
204 + struct ccu_div_internal m;
205 struct ccu_mux_internal mux;
207 struct ccu_common common;
208 --- a/drivers/clk/sunxi-ng/ccu_nkmp.h
209 +++ b/drivers/clk/sunxi-ng/ccu_nkmp.h
210 @@ -29,10 +29,10 @@ struct ccu_nkmp {
214 - struct _ccu_mult n;
215 - struct _ccu_mult k;
218 + struct ccu_mult_internal n;
219 + struct ccu_mult_internal k;
220 + struct ccu_div_internal m;
221 + struct ccu_div_internal p;
223 struct ccu_common common;
225 --- a/drivers/clk/sunxi-ng/ccu_nm.h
226 +++ b/drivers/clk/sunxi-ng/ccu_nm.h
227 @@ -30,9 +30,9 @@ struct ccu_nm {
231 - struct _ccu_mult n;
233 - struct _ccu_frac frac;
234 + struct ccu_mult_internal n;
235 + struct ccu_div_internal m;
236 + struct ccu_frac_internal frac;
238 struct ccu_common common;