Skip to content

Commit 7a3663c

Browse files
Uwe Kleine-Königthierryreding
authored andcommitted
pwm: jz4740: Consistently name driver data "jz"
Most but not all pointers to driver data are already called "jz": $ git grep 'struct jz4740_pwm_chip \*' v6.5-rc1 -- drivers/pwm/pwm-jz4740.c v6.5-rc1:drivers/pwm/pwm-jz4740.c:static inline struct jz4740_pwm_chip *to_jz4740(struct pwm_chip *chip) v6.5-rc1:drivers/pwm/pwm-jz4740.c:static bool jz4740_pwm_can_use_chn(struct jz4740_pwm_chip *jz, v6.5-rc1:drivers/pwm/pwm-jz4740.c: struct jz4740_pwm_chip *jz = to_jz4740(chip); v6.5-rc1:drivers/pwm/pwm-jz4740.c: struct jz4740_pwm_chip *jz = to_jz4740(chip); v6.5-rc1:drivers/pwm/pwm-jz4740.c: struct jz4740_pwm_chip *jz = to_jz4740(chip); v6.5-rc1:drivers/pwm/pwm-jz4740.c: struct jz4740_pwm_chip *jz4740 = to_jz4740(pwm->chip); v6.5-rc1:drivers/pwm/pwm-jz4740.c: struct jz4740_pwm_chip *jz4740; Adapt the two variables called "jz4740" to use the same name for consistency. Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
1 parent 1628447 commit 7a3663c

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

drivers/pwm/pwm-jz4740.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static void jz4740_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
121121
static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
122122
const struct pwm_state *state)
123123
{
124-
struct jz4740_pwm_chip *jz4740 = to_jz4740(pwm->chip);
124+
struct jz4740_pwm_chip *jz = to_jz4740(pwm->chip);
125125
unsigned long long tmp = 0xffffull * NSEC_PER_SEC;
126126
struct clk *clk = pwm_get_chip_data(pwm);
127127
unsigned long period, duty;
@@ -173,16 +173,16 @@ static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
173173
}
174174

175175
/* Reset counter to 0 */
176-
regmap_write(jz4740->map, TCU_REG_TCNTc(pwm->hwpwm), 0);
176+
regmap_write(jz->map, TCU_REG_TCNTc(pwm->hwpwm), 0);
177177

178178
/* Set duty */
179-
regmap_write(jz4740->map, TCU_REG_TDHRc(pwm->hwpwm), duty);
179+
regmap_write(jz->map, TCU_REG_TDHRc(pwm->hwpwm), duty);
180180

181181
/* Set period */
182-
regmap_write(jz4740->map, TCU_REG_TDFRc(pwm->hwpwm), period);
182+
regmap_write(jz->map, TCU_REG_TDFRc(pwm->hwpwm), period);
183183

184184
/* Set abrupt shutdown */
185-
regmap_set_bits(jz4740->map, TCU_REG_TCSRc(pwm->hwpwm),
185+
regmap_set_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm),
186186
TCU_TCSR_PWM_SD);
187187

188188
/*
@@ -199,10 +199,10 @@ static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
199199
* state instead of its inactive state.
200200
*/
201201
if ((state->polarity == PWM_POLARITY_NORMAL) ^ state->enabled)
202-
regmap_update_bits(jz4740->map, TCU_REG_TCSRc(pwm->hwpwm),
202+
regmap_update_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm),
203203
TCU_TCSR_PWM_INITL_HIGH, 0);
204204
else
205-
regmap_update_bits(jz4740->map, TCU_REG_TCSRc(pwm->hwpwm),
205+
regmap_update_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm),
206206
TCU_TCSR_PWM_INITL_HIGH,
207207
TCU_TCSR_PWM_INITL_HIGH);
208208

@@ -222,28 +222,28 @@ static const struct pwm_ops jz4740_pwm_ops = {
222222
static int jz4740_pwm_probe(struct platform_device *pdev)
223223
{
224224
struct device *dev = &pdev->dev;
225-
struct jz4740_pwm_chip *jz4740;
225+
struct jz4740_pwm_chip *jz;
226226
const struct soc_info *info;
227227

228228
info = device_get_match_data(dev);
229229
if (!info)
230230
return -EINVAL;
231231

232-
jz4740 = devm_kzalloc(dev, sizeof(*jz4740), GFP_KERNEL);
233-
if (!jz4740)
232+
jz = devm_kzalloc(dev, sizeof(*jz), GFP_KERNEL);
233+
if (!jz)
234234
return -ENOMEM;
235235

236-
jz4740->map = device_node_to_regmap(dev->parent->of_node);
237-
if (IS_ERR(jz4740->map)) {
238-
dev_err(dev, "regmap not found: %ld\n", PTR_ERR(jz4740->map));
239-
return PTR_ERR(jz4740->map);
236+
jz->map = device_node_to_regmap(dev->parent->of_node);
237+
if (IS_ERR(jz->map)) {
238+
dev_err(dev, "regmap not found: %ld\n", PTR_ERR(jz->map));
239+
return PTR_ERR(jz->map);
240240
}
241241

242-
jz4740->chip.dev = dev;
243-
jz4740->chip.ops = &jz4740_pwm_ops;
244-
jz4740->chip.npwm = info->num_pwms;
242+
jz->chip.dev = dev;
243+
jz->chip.ops = &jz4740_pwm_ops;
244+
jz->chip.npwm = info->num_pwms;
245245

246-
return devm_pwmchip_add(dev, &jz4740->chip);
246+
return devm_pwmchip_add(dev, &jz->chip);
247247
}
248248

249249
static const struct soc_info jz4740_soc_info = {

0 commit comments

Comments
 (0)