@@ -38,11 +38,11 @@ static inline struct atmel_hlcdc_pwm *to_atmel_hlcdc_pwm(struct pwm_chip *chip)
3838 return container_of (chip , struct atmel_hlcdc_pwm , chip );
3939}
4040
41- static int atmel_hlcdc_pwm_apply (struct pwm_chip * c , struct pwm_device * pwm ,
41+ static int atmel_hlcdc_pwm_apply (struct pwm_chip * chip , struct pwm_device * pwm ,
4242 const struct pwm_state * state )
4343{
44- struct atmel_hlcdc_pwm * chip = to_atmel_hlcdc_pwm (c );
45- struct atmel_hlcdc * hlcdc = chip -> hlcdc ;
44+ struct atmel_hlcdc_pwm * atmel = to_atmel_hlcdc_pwm (chip );
45+ struct atmel_hlcdc * hlcdc = atmel -> hlcdc ;
4646 unsigned int status ;
4747 int ret ;
4848
@@ -54,7 +54,7 @@ static int atmel_hlcdc_pwm_apply(struct pwm_chip *c, struct pwm_device *pwm,
5454 u32 pwmcfg ;
5555 int pres ;
5656
57- if (!chip -> errata || !chip -> errata -> slow_clk_erratum ) {
57+ if (!atmel -> errata || !atmel -> errata -> slow_clk_erratum ) {
5858 clk_freq = clk_get_rate (new_clk );
5959 if (!clk_freq )
6060 return - EINVAL ;
@@ -64,7 +64,7 @@ static int atmel_hlcdc_pwm_apply(struct pwm_chip *c, struct pwm_device *pwm,
6464 }
6565
6666 /* Errata: cannot use slow clk on some IP revisions */
67- if ((chip -> errata && chip -> errata -> slow_clk_erratum ) ||
67+ if ((atmel -> errata && atmel -> errata -> slow_clk_erratum ) ||
6868 clk_period_ns > state -> period ) {
6969 new_clk = hlcdc -> sys_clk ;
7070 clk_freq = clk_get_rate (new_clk );
@@ -77,8 +77,8 @@ static int atmel_hlcdc_pwm_apply(struct pwm_chip *c, struct pwm_device *pwm,
7777
7878 for (pres = 0 ; pres <= ATMEL_HLCDC_PWMPS_MAX ; pres ++ ) {
7979 /* Errata: cannot divide by 1 on some IP revisions */
80- if (!pres && chip -> errata &&
81- chip -> errata -> div1_clk_erratum )
80+ if (!pres && atmel -> errata &&
81+ atmel -> errata -> div1_clk_erratum )
8282 continue ;
8383
8484 if ((clk_period_ns << pres ) >= state -> period )
@@ -90,16 +90,16 @@ static int atmel_hlcdc_pwm_apply(struct pwm_chip *c, struct pwm_device *pwm,
9090
9191 pwmcfg = ATMEL_HLCDC_PWMPS (pres );
9292
93- if (new_clk != chip -> cur_clk ) {
93+ if (new_clk != atmel -> cur_clk ) {
9494 u32 gencfg = 0 ;
9595 int ret ;
9696
9797 ret = clk_prepare_enable (new_clk );
9898 if (ret )
9999 return ret ;
100100
101- clk_disable_unprepare (chip -> cur_clk );
102- chip -> cur_clk = new_clk ;
101+ clk_disable_unprepare (atmel -> cur_clk );
102+ atmel -> cur_clk = new_clk ;
103103
104104 if (new_clk == hlcdc -> sys_clk )
105105 gencfg = ATMEL_HLCDC_CLKPWMSEL ;
@@ -160,8 +160,8 @@ static int atmel_hlcdc_pwm_apply(struct pwm_chip *c, struct pwm_device *pwm,
160160 if (ret )
161161 return ret ;
162162
163- clk_disable_unprepare (chip -> cur_clk );
164- chip -> cur_clk = NULL ;
163+ clk_disable_unprepare (atmel -> cur_clk );
164+ atmel -> cur_clk = NULL ;
165165 }
166166
167167 return 0 ;
@@ -183,31 +183,32 @@ static const struct atmel_hlcdc_pwm_errata atmel_hlcdc_pwm_sama5d3_errata = {
183183#ifdef CONFIG_PM_SLEEP
184184static int atmel_hlcdc_pwm_suspend (struct device * dev )
185185{
186- struct atmel_hlcdc_pwm * chip = dev_get_drvdata (dev );
186+ struct atmel_hlcdc_pwm * atmel = dev_get_drvdata (dev );
187187
188188 /* Keep the periph clock enabled if the PWM is still running. */
189- if (pwm_is_enabled (& chip -> chip .pwms [0 ]))
190- clk_disable_unprepare (chip -> hlcdc -> periph_clk );
189+ if (pwm_is_enabled (& atmel -> chip .pwms [0 ]))
190+ clk_disable_unprepare (atmel -> hlcdc -> periph_clk );
191191
192192 return 0 ;
193193}
194194
195195static int atmel_hlcdc_pwm_resume (struct device * dev )
196196{
197- struct atmel_hlcdc_pwm * chip = dev_get_drvdata (dev );
197+ struct atmel_hlcdc_pwm * atmel = dev_get_drvdata (dev );
198198 struct pwm_state state ;
199199 int ret ;
200200
201- pwm_get_state (& chip -> chip .pwms [0 ], & state );
201+ pwm_get_state (& atmel -> chip .pwms [0 ], & state );
202202
203203 /* Re-enable the periph clock it was stopped during suspend. */
204204 if (!state .enabled ) {
205- ret = clk_prepare_enable (chip -> hlcdc -> periph_clk );
205+ ret = clk_prepare_enable (atmel -> hlcdc -> periph_clk );
206206 if (ret )
207207 return ret ;
208208 }
209209
210- return atmel_hlcdc_pwm_apply (& chip -> chip , & chip -> chip .pwms [0 ], & state );
210+ return atmel_hlcdc_pwm_apply (& atmel -> chip , & atmel -> chip .pwms [0 ],
211+ & state );
211212}
212213#endif
213214
@@ -244,14 +245,14 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
244245{
245246 const struct of_device_id * match ;
246247 struct device * dev = & pdev -> dev ;
247- struct atmel_hlcdc_pwm * chip ;
248+ struct atmel_hlcdc_pwm * atmel ;
248249 struct atmel_hlcdc * hlcdc ;
249250 int ret ;
250251
251252 hlcdc = dev_get_drvdata (dev -> parent );
252253
253- chip = devm_kzalloc (dev , sizeof (* chip ), GFP_KERNEL );
254- if (!chip )
254+ atmel = devm_kzalloc (dev , sizeof (* atmel ), GFP_KERNEL );
255+ if (!atmel )
255256 return - ENOMEM ;
256257
257258 ret = clk_prepare_enable (hlcdc -> periph_clk );
@@ -260,31 +261,31 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
260261
261262 match = of_match_node (atmel_hlcdc_dt_ids , dev -> parent -> of_node );
262263 if (match )
263- chip -> errata = match -> data ;
264+ atmel -> errata = match -> data ;
264265
265- chip -> hlcdc = hlcdc ;
266- chip -> chip .ops = & atmel_hlcdc_pwm_ops ;
267- chip -> chip .dev = dev ;
268- chip -> chip .npwm = 1 ;
266+ atmel -> hlcdc = hlcdc ;
267+ atmel -> chip .ops = & atmel_hlcdc_pwm_ops ;
268+ atmel -> chip .dev = dev ;
269+ atmel -> chip .npwm = 1 ;
269270
270- ret = pwmchip_add (& chip -> chip );
271+ ret = pwmchip_add (& atmel -> chip );
271272 if (ret ) {
272273 clk_disable_unprepare (hlcdc -> periph_clk );
273274 return ret ;
274275 }
275276
276- platform_set_drvdata (pdev , chip );
277+ platform_set_drvdata (pdev , atmel );
277278
278279 return 0 ;
279280}
280281
281282static void atmel_hlcdc_pwm_remove (struct platform_device * pdev )
282283{
283- struct atmel_hlcdc_pwm * chip = platform_get_drvdata (pdev );
284+ struct atmel_hlcdc_pwm * atmel = platform_get_drvdata (pdev );
284285
285- pwmchip_remove (& chip -> chip );
286+ pwmchip_remove (& atmel -> chip );
286287
287- clk_disable_unprepare (chip -> hlcdc -> periph_clk );
288+ clk_disable_unprepare (atmel -> hlcdc -> periph_clk );
288289}
289290
290291static const struct of_device_id atmel_hlcdc_pwm_dt_ids [] = {
0 commit comments