pwm: sti: Prepare removing pwm_chip from driver data

[ Upstream commit 54272761ce7c475fa30a31b59b0cb89f7652b39e ]

This prepares the driver for further changes that will drop struct
pwm_chip chip from struct sti_pwm_chip. Use the pwm_chip as driver data
instead of the sti_pwm_chip to get access to the pwm_chip in
sti_pwm_remove() without using pc->chip.

Link: https://lore.kernel.org/r/56d53372aacff6871df4d6c6779c9dac94592696.1707900770.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Stable-dep-of: 5bb0b194aeee ("pwm: sti: Simplify probe function using devm functions")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index c782378dff5e5ec669a138787428fad9c1bad8ab..8f7aff51787be4464f1901bd28cabee279b02cb8 100644 (file)
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -571,6 +571,7 @@ static int sti_pwm_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct sti_pwm_compat_data *cdata;
+       struct pwm_chip *chip;
        struct sti_pwm_chip *pc;
        unsigned int i;
        int irq, ret;
@@ -578,6 +579,7 @@ static int sti_pwm_probe(struct platform_device *pdev)
        pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
        if (!pc)
                return -ENOMEM;
+       chip = &pc->chip;
 
        cdata = devm_kzalloc(dev, sizeof(*cdata), GFP_KERNEL);
        if (!cdata)
@@ -654,9 +656,9 @@ static int sti_pwm_probe(struct platform_device *pdev)
                        return -ENOMEM;
        }
 
-       pc->chip.dev = dev;
-       pc->chip.ops = &sti_pwm_ops;
-       pc->chip.npwm = max(cdata->pwm_num_devs, cdata->cpt_num_devs);
+       chip->dev = dev;
+       chip->ops = &sti_pwm_ops;
+       chip->npwm = max(cdata->pwm_num_devs, cdata->cpt_num_devs);
 
        for (i = 0; i < cdata->cpt_num_devs; i++) {
                struct sti_cpt_ddata *ddata = &cdata->ddata[i];
@@ -665,23 +667,24 @@ static int sti_pwm_probe(struct platform_device *pdev)
                mutex_init(&ddata->lock);
        }
 
-       ret = pwmchip_add(&pc->chip);
+       ret = pwmchip_add(chip);
        if (ret < 0) {
                clk_unprepare(pc->pwm_clk);
                clk_unprepare(pc->cpt_clk);
                return ret;
        }
 
-       platform_set_drvdata(pdev, pc);
+       platform_set_drvdata(pdev, chip);
 
        return 0;
 }
 
 static void sti_pwm_remove(struct platform_device *pdev)
 {
-       struct sti_pwm_chip *pc = platform_get_drvdata(pdev);
+       struct pwm_chip *chip = platform_get_drvdata(pdev);
+       struct sti_pwm_chip *pc = to_sti_pwmchip(chip);
 
-       pwmchip_remove(&pc->chip);
+       pwmchip_remove(chip);
 
        clk_unprepare(pc->pwm_clk);
        clk_unprepare(pc->cpt_clk);