pwm: fsl-ftm: Prepare removing pwm_chip from driver data

This prepares the driver for further changes that will drop struct
pwm_chip chip from struct fsl_pwm_chip. Use the pwm_chip as driver data
instead of the fsl_pwm_chip to get access to the pwm_chip in
fsl_pwm_suspend() and fsl_pwm_resume() without using fpc->chip.

Link: https://lore.kernel.org/r/2cf27e2929505c05f84501d6fce96f23eba03fc3.1707900770.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/drivers/pwm/pwm-fsl-ftm.c b/drivers/pwm/pwm-fsl-ftm.c
index 47f1f5ac39cf6c039d27f77c367154492c37f284..b4f8dff60c50a99d36ee27683df86efbe1fbad84 100644 (file)
--- a/drivers/pwm/pwm-fsl-ftm.c
+++ b/drivers/pwm/pwm-fsl-ftm.c
@@ -393,6 +393,7 @@ static const struct regmap_config fsl_pwm_regmap_config = {
 
 static int fsl_pwm_probe(struct platform_device *pdev)
 {
+       struct pwm_chip *chip;
        struct fsl_pwm_chip *fpc;
        void __iomem *base;
        int ret;
@@ -400,11 +401,12 @@ static int fsl_pwm_probe(struct platform_device *pdev)
        fpc = devm_kzalloc(&pdev->dev, sizeof(*fpc), GFP_KERNEL);
        if (!fpc)
                return -ENOMEM;
+       chip = &fpc->chip;
 
        mutex_init(&fpc->lock);
 
        fpc->soc = of_device_get_match_data(&pdev->dev);
-       fpc->chip.dev = &pdev->dev;
+       chip->dev = &pdev->dev;
 
        base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(base))
@@ -423,16 +425,16 @@ static int fsl_pwm_probe(struct platform_device *pdev)
                return PTR_ERR(fpc->clk[FSL_PWM_CLK_SYS]);
        }
 
-       fpc->clk[FSL_PWM_CLK_FIX] = devm_clk_get(fpc->chip.dev, "ftm_fix");
+       fpc->clk[FSL_PWM_CLK_FIX] = devm_clk_get(&pdev->dev, "ftm_fix");
        if (IS_ERR(fpc->clk[FSL_PWM_CLK_FIX]))
                return PTR_ERR(fpc->clk[FSL_PWM_CLK_FIX]);
 
-       fpc->clk[FSL_PWM_CLK_EXT] = devm_clk_get(fpc->chip.dev, "ftm_ext");
+       fpc->clk[FSL_PWM_CLK_EXT] = devm_clk_get(&pdev->dev, "ftm_ext");
        if (IS_ERR(fpc->clk[FSL_PWM_CLK_EXT]))
                return PTR_ERR(fpc->clk[FSL_PWM_CLK_EXT]);
 
        fpc->clk[FSL_PWM_CLK_CNTEN] =
-                               devm_clk_get(fpc->chip.dev, "ftm_cnt_clk_en");
+                               devm_clk_get(&pdev->dev, "ftm_cnt_clk_en");
        if (IS_ERR(fpc->clk[FSL_PWM_CLK_CNTEN]))
                return PTR_ERR(fpc->clk[FSL_PWM_CLK_CNTEN]);
 
@@ -445,16 +447,16 @@ static int fsl_pwm_probe(struct platform_device *pdev)
                fpc->ipg_clk = fpc->clk[FSL_PWM_CLK_SYS];
 
 
-       fpc->chip.ops = &fsl_pwm_ops;
-       fpc->chip.npwm = 8;
+       chip->ops = &fsl_pwm_ops;
+       chip->npwm = 8;
 
-       ret = devm_pwmchip_add(&pdev->dev, &fpc->chip);
+       ret = devm_pwmchip_add(&pdev->dev, chip);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
                return ret;
        }
 
-       platform_set_drvdata(pdev, fpc);
+       platform_set_drvdata(pdev, chip);
 
        return fsl_pwm_init(fpc);
 }
@@ -462,14 +464,15 @@ static int fsl_pwm_probe(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int fsl_pwm_suspend(struct device *dev)
 {
-       struct fsl_pwm_chip *fpc = dev_get_drvdata(dev);
+       struct pwm_chip *chip = dev_get_drvdata(dev);
+       struct fsl_pwm_chip *fpc = to_fsl_chip(chip);
        int i;
 
        regcache_cache_only(fpc->regmap, true);
        regcache_mark_dirty(fpc->regmap);
 
-       for (i = 0; i < fpc->chip.npwm; i++) {
-               struct pwm_device *pwm = &fpc->chip.pwms[i];
+       for (i = 0; i < chip->npwm; i++) {
+               struct pwm_device *pwm = &chip->pwms[i];
 
                if (!test_bit(PWMF_REQUESTED, &pwm->flags))
                        continue;
@@ -488,11 +491,12 @@ static int fsl_pwm_suspend(struct device *dev)
 
 static int fsl_pwm_resume(struct device *dev)
 {
-       struct fsl_pwm_chip *fpc = dev_get_drvdata(dev);
+       struct pwm_chip *chip = dev_get_drvdata(dev);
+       struct fsl_pwm_chip *fpc = to_fsl_chip(chip);
        int i;
 
-       for (i = 0; i < fpc->chip.npwm; i++) {
-               struct pwm_device *pwm = &fpc->chip.pwms[i];
+       for (i = 0; i < chip->npwm; i++) {
+               struct pwm_device *pwm = &chip->pwms[i];
 
                if (!test_bit(PWMF_REQUESTED, &pwm->flags))
                        continue;