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

pwm: stmpe: Rename variable pointing to driver private data 



In all code locations but the probe function variables of type struct
stmpe_pwm * are called "stmpe_pwm". Align the name used in
stmpe_pwm_probe() accordingly. Still more as the current name "pwm" is
usually reserved for variables of type struct pwm_device *.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 74746ac0

drivers/pwm/pwm-stmpe.c

+8 −8
Original line number Diff line number Diff line
@@ -269,19 +269,19 @@ static const struct pwm_ops stmpe_24xx_pwm_ops = { 
static int __init stmpe_pwm_probe(struct platform_device *pdev)

{

	struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);

	struct stmpe_pwm *pwm;

	struct stmpe_pwm *stmpe_pwm;

	int ret;



	pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL);

	if (!pwm)

	stmpe_pwm = devm_kzalloc(&pdev->dev, sizeof(*stmpe_pwm), GFP_KERNEL);

	if (!stmpe_pwm)

		return -ENOMEM;



	pwm->stmpe = stmpe;

	pwm->chip.dev = &pdev->dev;

	stmpe_pwm->stmpe = stmpe;

	stmpe_pwm->chip.dev = &pdev->dev;



	if (stmpe->partnum == STMPE2401 || stmpe->partnum == STMPE2403) {

		pwm->chip.ops = &stmpe_24xx_pwm_ops;

		pwm->chip.npwm = 3;

		stmpe_pwm->chip.ops = &stmpe_24xx_pwm_ops;

		stmpe_pwm->chip.npwm = 3;

	} else {

		if (stmpe->partnum == STMPE1601)

			dev_err(&pdev->dev, "STMPE1601 not yet supported\n");
@@ -295,7 +295,7 @@ static int __init stmpe_pwm_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = pwmchip_add(&pwm->chip);

	ret = pwmchip_add(&stmpe_pwm->chip);

	if (ret) {

		stmpe_disable(stmpe, STMPE_BLOCK_PWM);

		return ret;