pwm: rz-mtu3: Prepare removing pwm_chip from driver data

This prepares the driver for further changes that will drop struct
pwm_chip chip from struct rz_mtu3_pwm_chip. Use the pwm_chip as driver
data and devm callback parameter instead of the rz_mtu3_pwm_chip to get
access to the pwm_chip in various functions without using
rz_mtu3_pwm->chip.

Link: https://lore.kernel.org/r/707f2aced94a235f244022f10202ce7730b1168b.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-rz-mtu3.c b/drivers/pwm/pwm-rz-mtu3.c
index acdc45ff90cfa9a93e96004d3d85c31c2e251520..a129ae4ef338cbe27b6a5ab9087499cc470aa000 100644 (file)
--- a/drivers/pwm/pwm-rz-mtu3.c
+++ b/drivers/pwm/pwm-rz-mtu3.c
@@ -211,15 +211,15 @@ static void rz_mtu3_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
        mutex_unlock(&rz_mtu3_pwm->lock);
 }
 
-static int rz_mtu3_pwm_enable(struct rz_mtu3_pwm_chip *rz_mtu3_pwm,
-                             struct pwm_device *pwm)
+static int rz_mtu3_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 {
+       struct rz_mtu3_pwm_chip *rz_mtu3_pwm = to_rz_mtu3_pwm_chip(chip);
        struct rz_mtu3_pwm_channel *priv;
        u32 ch;
        u8 val;
        int rc;
 
-       rc = pm_runtime_resume_and_get(pwmchip_parent(&rz_mtu3_pwm->chip));
+       rc = pm_runtime_resume_and_get(pwmchip_parent(chip));
        if (rc)
                return rc;
 
@@ -243,9 +243,9 @@ static int rz_mtu3_pwm_enable(struct rz_mtu3_pwm_chip *rz_mtu3_pwm,
        return 0;
 }
 
-static void rz_mtu3_pwm_disable(struct rz_mtu3_pwm_chip *rz_mtu3_pwm,
-                               struct pwm_device *pwm)
+static void rz_mtu3_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 {
+       struct rz_mtu3_pwm_chip *rz_mtu3_pwm = to_rz_mtu3_pwm_chip(chip);
        struct rz_mtu3_pwm_channel *priv;
        u32 ch;
 
@@ -265,7 +265,7 @@ static void rz_mtu3_pwm_disable(struct rz_mtu3_pwm_chip *rz_mtu3_pwm,
 
        mutex_unlock(&rz_mtu3_pwm->lock);
 
-       pm_runtime_put_sync(pwmchip_parent(&rz_mtu3_pwm->chip));
+       pm_runtime_put_sync(pwmchip_parent(chip));
 }
 
 static int rz_mtu3_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
@@ -416,7 +416,7 @@ static int rz_mtu3_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 
        if (!state->enabled) {
                if (enabled)
-                       rz_mtu3_pwm_disable(rz_mtu3_pwm, pwm);
+                       rz_mtu3_pwm_disable(chip, pwm);
 
                return 0;
        }
@@ -428,7 +428,7 @@ static int rz_mtu3_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
                return ret;
 
        if (!enabled)
-               ret = rz_mtu3_pwm_enable(rz_mtu3_pwm, pwm);
+               ret = rz_mtu3_pwm_enable(chip, pwm);
 
        return ret;
 }
@@ -442,7 +442,8 @@ static const struct pwm_ops rz_mtu3_pwm_ops = {
 
 static int rz_mtu3_pwm_pm_runtime_suspend(struct device *dev)
 {
-       struct rz_mtu3_pwm_chip *rz_mtu3_pwm = dev_get_drvdata(dev);
+       struct pwm_chip *chip = dev_get_drvdata(dev);
+       struct rz_mtu3_pwm_chip *rz_mtu3_pwm = to_rz_mtu3_pwm_chip(chip);
 
        clk_disable_unprepare(rz_mtu3_pwm->clk);
 
@@ -451,7 +452,8 @@ static int rz_mtu3_pwm_pm_runtime_suspend(struct device *dev)
 
 static int rz_mtu3_pwm_pm_runtime_resume(struct device *dev)
 {
-       struct rz_mtu3_pwm_chip *rz_mtu3_pwm = dev_get_drvdata(dev);
+       struct pwm_chip *chip = dev_get_drvdata(dev);
+       struct rz_mtu3_pwm_chip *rz_mtu3_pwm = to_rz_mtu3_pwm_chip(chip);
 
        return clk_prepare_enable(rz_mtu3_pwm->clk);
 }
@@ -462,17 +464,19 @@ static DEFINE_RUNTIME_DEV_PM_OPS(rz_mtu3_pwm_pm_ops,
 
 static void rz_mtu3_pwm_pm_disable(void *data)
 {
-       struct rz_mtu3_pwm_chip *rz_mtu3_pwm = data;
+       struct pwm_chip *chip = data;
+       struct rz_mtu3_pwm_chip *rz_mtu3_pwm = to_rz_mtu3_pwm_chip(chip);
 
        clk_rate_exclusive_put(rz_mtu3_pwm->clk);
-       pm_runtime_disable(pwmchip_parent(&rz_mtu3_pwm->chip));
-       pm_runtime_set_suspended(pwmchip_parent(&rz_mtu3_pwm->chip));
+       pm_runtime_disable(pwmchip_parent(chip));
+       pm_runtime_set_suspended(pwmchip_parent(chip));
 }
 
 static int rz_mtu3_pwm_probe(struct platform_device *pdev)
 {
        struct rz_mtu3 *parent_ddata = dev_get_drvdata(pdev->dev.parent);
        struct rz_mtu3_pwm_chip *rz_mtu3_pwm;
+       struct pwm_chip *chip;
        struct device *dev = &pdev->dev;
        unsigned int i, j = 0;
        int ret;
@@ -480,6 +484,7 @@ static int rz_mtu3_pwm_probe(struct platform_device *pdev)
        rz_mtu3_pwm = devm_kzalloc(&pdev->dev, sizeof(*rz_mtu3_pwm), GFP_KERNEL);
        if (!rz_mtu3_pwm)
                return -ENOMEM;
+       chip = &rz_mtu3_pwm->chip;
 
        rz_mtu3_pwm->clk = parent_ddata->clk;
 
@@ -494,7 +499,7 @@ static int rz_mtu3_pwm_probe(struct platform_device *pdev)
        }
 
        mutex_init(&rz_mtu3_pwm->lock);
-       platform_set_drvdata(pdev, rz_mtu3_pwm);
+       platform_set_drvdata(pdev, chip);
        ret = clk_prepare_enable(rz_mtu3_pwm->clk);
        if (ret)
                return dev_err_probe(dev, ret, "Clock enable failed\n");
@@ -514,15 +519,15 @@ static int rz_mtu3_pwm_probe(struct platform_device *pdev)
 
        pm_runtime_set_active(&pdev->dev);
        pm_runtime_enable(&pdev->dev);
-       rz_mtu3_pwm->chip.dev = &pdev->dev;
+       chip->dev = &pdev->dev;
        ret = devm_add_action_or_reset(&pdev->dev, rz_mtu3_pwm_pm_disable,
-                                      rz_mtu3_pwm);
+                                      chip);
        if (ret < 0)
                return ret;
 
-       rz_mtu3_pwm->chip.ops = &rz_mtu3_pwm_ops;
-       rz_mtu3_pwm->chip.npwm = RZ_MTU3_MAX_PWM_CHANNELS;
-       ret = devm_pwmchip_add(&pdev->dev, &rz_mtu3_pwm->chip);
+       chip->ops = &rz_mtu3_pwm_ops;
+       chip->npwm = RZ_MTU3_MAX_PWM_CHANNELS;
+       ret = devm_pwmchip_add(&pdev->dev, chip);
        if (ret)
                return dev_err_probe(&pdev->dev, ret, "failed to add PWM chip\n");