Skip to content

Commit abf6569

Browse files
author
Uwe Kleine-König
committed
pwm: imx-tpm: Make use of devm_pwmchip_alloc() function
This prepares the pwm-tmp driver to further changes of the pwm core outlined in the commit introducing devm_pwmchip_alloc(). There is no intended semantical change and the driver should behave as before. Link: https://lore.kernel.org/r/5de5d53295fa445d58a79f83421dd3406166c3c6.1707900770.git.u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <[email protected]>
1 parent dcef392 commit abf6569

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

drivers/pwm/pwm-imx-tpm.c

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
#define PWM_IMX_TPM_MOD_MOD GENMASK(PWM_IMX_TPM_MOD_WIDTH - 1, 0)
5858

5959
struct imx_tpm_pwm_chip {
60-
struct pwm_chip chip;
6160
struct clk *clk;
6261
void __iomem *base;
6362
struct mutex lock;
@@ -75,7 +74,7 @@ struct imx_tpm_pwm_param {
7574
static inline struct imx_tpm_pwm_chip *
7675
to_imx_tpm_pwm_chip(struct pwm_chip *chip)
7776
{
78-
return container_of(chip, struct imx_tpm_pwm_chip, chip);
77+
return pwmchip_get_drvdata(chip);
7978
}
8079

8180
/*
@@ -336,35 +335,40 @@ static const struct pwm_ops imx_tpm_pwm_ops = {
336335

337336
static int pwm_imx_tpm_probe(struct platform_device *pdev)
338337
{
338+
struct pwm_chip *chip;
339339
struct imx_tpm_pwm_chip *tpm;
340+
void __iomem *base;
340341
int ret;
342+
unsigned int npwm;
341343
u32 val;
342344

343-
tpm = devm_kzalloc(&pdev->dev, sizeof(*tpm), GFP_KERNEL);
344-
if (!tpm)
345-
return -ENOMEM;
345+
base = devm_platform_ioremap_resource(pdev, 0);
346+
if (IS_ERR(base))
347+
return PTR_ERR(base);
348+
349+
/* get number of channels */
350+
val = readl(base + PWM_IMX_TPM_PARAM);
351+
npwm = FIELD_GET(PWM_IMX_TPM_PARAM_CHAN, val);
352+
353+
chip = devm_pwmchip_alloc(&pdev->dev, npwm, sizeof(*tpm));
354+
if (IS_ERR(chip))
355+
return PTR_ERR(chip);
356+
tpm = to_imx_tpm_pwm_chip(chip);
346357

347358
platform_set_drvdata(pdev, tpm);
348359

349-
tpm->base = devm_platform_ioremap_resource(pdev, 0);
350-
if (IS_ERR(tpm->base))
351-
return PTR_ERR(tpm->base);
360+
tpm->base = base;
352361

353362
tpm->clk = devm_clk_get_enabled(&pdev->dev, NULL);
354363
if (IS_ERR(tpm->clk))
355364
return dev_err_probe(&pdev->dev, PTR_ERR(tpm->clk),
356365
"failed to get PWM clock\n");
357366

358-
tpm->chip.dev = &pdev->dev;
359-
tpm->chip.ops = &imx_tpm_pwm_ops;
360-
361-
/* get number of channels */
362-
val = readl(tpm->base + PWM_IMX_TPM_PARAM);
363-
tpm->chip.npwm = FIELD_GET(PWM_IMX_TPM_PARAM_CHAN, val);
367+
chip->ops = &imx_tpm_pwm_ops;
364368

365369
mutex_init(&tpm->lock);
366370

367-
ret = devm_pwmchip_add(&pdev->dev, &tpm->chip);
371+
ret = devm_pwmchip_add(&pdev->dev, chip);
368372
if (ret)
369373
return dev_err_probe(&pdev->dev, ret, "failed to add PWM chip\n");
370374

0 commit comments

Comments
 (0)