Commit 7a3663c2 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Thierry Reding
Browse files

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: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20230808062608.897710-1-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 16284474

drivers/pwm/pwm-jz4740.c

+18 −18
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void jz4740_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) 
static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,

			    const struct pwm_state *state)

{

	struct jz4740_pwm_chip *jz4740 = to_jz4740(pwm->chip);

	struct jz4740_pwm_chip *jz = to_jz4740(pwm->chip);

	unsigned long long tmp = 0xffffull * NSEC_PER_SEC;

	struct clk *clk = pwm_get_chip_data(pwm);

	unsigned long period, duty;
@@ -173,16 +173,16 @@ static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	}



	/* Reset counter to 0 */

	regmap_write(jz4740->map, TCU_REG_TCNTc(pwm->hwpwm), 0);

	regmap_write(jz->map, TCU_REG_TCNTc(pwm->hwpwm), 0);



	/* Set duty */

	regmap_write(jz4740->map, TCU_REG_TDHRc(pwm->hwpwm), duty);

	regmap_write(jz->map, TCU_REG_TDHRc(pwm->hwpwm), duty);



	/* Set period */

	regmap_write(jz4740->map, TCU_REG_TDFRc(pwm->hwpwm), period);

	regmap_write(jz->map, TCU_REG_TDFRc(pwm->hwpwm), period);



	/* Set abrupt shutdown */

	regmap_set_bits(jz4740->map, TCU_REG_TCSRc(pwm->hwpwm),

	regmap_set_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm),

			TCU_TCSR_PWM_SD);



	/*
@@ -199,10 +199,10 @@ static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	 * state instead of its inactive state.

	 */

	if ((state->polarity == PWM_POLARITY_NORMAL) ^ state->enabled)

		regmap_update_bits(jz4740->map, TCU_REG_TCSRc(pwm->hwpwm),

		regmap_update_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm),

				   TCU_TCSR_PWM_INITL_HIGH, 0);

	else

		regmap_update_bits(jz4740->map, TCU_REG_TCSRc(pwm->hwpwm),

		regmap_update_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm),

				   TCU_TCSR_PWM_INITL_HIGH,

				   TCU_TCSR_PWM_INITL_HIGH);
@@ -222,28 +222,28 @@ static const struct pwm_ops jz4740_pwm_ops = { 
static int jz4740_pwm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct jz4740_pwm_chip *jz4740;

	struct jz4740_pwm_chip *jz;

	const struct soc_info *info;



	info = device_get_match_data(dev);

	if (!info)

		return -EINVAL;



	jz4740 = devm_kzalloc(dev, sizeof(*jz4740), GFP_KERNEL);

	if (!jz4740)

	jz = devm_kzalloc(dev, sizeof(*jz), GFP_KERNEL);

	if (!jz)

		return -ENOMEM;



	jz4740->map = device_node_to_regmap(dev->parent->of_node);

	if (IS_ERR(jz4740->map)) {

		dev_err(dev, "regmap not found: %ld\n", PTR_ERR(jz4740->map));

		return PTR_ERR(jz4740->map);

	jz->map = device_node_to_regmap(dev->parent->of_node);

	if (IS_ERR(jz->map)) {

		dev_err(dev, "regmap not found: %ld\n", PTR_ERR(jz->map));

		return PTR_ERR(jz->map);

	}



	jz4740->chip.dev = dev;

	jz4740->chip.ops = &jz4740_pwm_ops;

	jz4740->chip.npwm = info->num_pwms;

	jz->chip.dev = dev;

	jz->chip.ops = &jz4740_pwm_ops;

	jz->chip.npwm = info->num_pwms;



	return devm_pwmchip_add(dev, &jz4740->chip);

	return devm_pwmchip_add(dev, &jz->chip);

}



static const struct soc_info jz4740_soc_info = {