pwm: rz-mtu3: Make use of devm_pwmchip_alloc() function

This prepares the pwm-rz-mtu3 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/b05ffb9bcaf4ddb6305f8505715a5542805e3227.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 a129ae4ef338cbe27b6a5ab9087499cc470aa000..ab39bd37edafc12c5fe8e39f5cc3dce7fc4ccc21 100644 (file)
--- a/drivers/pwm/pwm-rz-mtu3.c
+++ b/drivers/pwm/pwm-rz-mtu3.c
@@ -61,7 +61,6 @@ struct rz_mtu3_pwm_channel {
 /**
  * struct rz_mtu3_pwm_chip - MTU3 pwm private data
  *
- * @chip: MTU3 pwm chip data
  * @clk: MTU3 module clock
  * @lock: Lock to prevent concurrent access for usage count
  * @rate: MTU3 clock rate
@@ -72,7 +71,6 @@ struct rz_mtu3_pwm_channel {
  */
 
 struct rz_mtu3_pwm_chip {
-       struct pwm_chip chip;
        struct clk *clk;
        struct mutex lock;
        unsigned long rate;
@@ -92,7 +90,7 @@ static const struct rz_mtu3_channel_io_map channel_map[] = {
 
 static inline struct rz_mtu3_pwm_chip *to_rz_mtu3_pwm_chip(struct pwm_chip *chip)
 {
-       return container_of(chip, struct rz_mtu3_pwm_chip, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 static void rz_mtu3_pwm_read_tgr_registers(struct rz_mtu3_pwm_channel *priv,
@@ -481,10 +479,11 @@ static int rz_mtu3_pwm_probe(struct platform_device *pdev)
        unsigned int i, j = 0;
        int ret;
 
-       rz_mtu3_pwm = devm_kzalloc(&pdev->dev, sizeof(*rz_mtu3_pwm), GFP_KERNEL);
-       if (!rz_mtu3_pwm)
-               return -ENOMEM;
-       chip = &rz_mtu3_pwm->chip;
+       chip = devm_pwmchip_alloc(&pdev->dev, RZ_MTU3_MAX_PWM_CHANNELS,
+                                 sizeof(*rz_mtu3_pwm));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       rz_mtu3_pwm = to_rz_mtu3_pwm_chip(chip);
 
        rz_mtu3_pwm->clk = parent_ddata->clk;
 
@@ -519,14 +518,12 @@ static int rz_mtu3_pwm_probe(struct platform_device *pdev)
 
        pm_runtime_set_active(&pdev->dev);
        pm_runtime_enable(&pdev->dev);
-       chip->dev = &pdev->dev;
        ret = devm_add_action_or_reset(&pdev->dev, rz_mtu3_pwm_pm_disable,
                                       chip);
        if (ret < 0)
                return ret;
 
        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");