pwm: hibvt: Make use of devm_pwmchip_alloc() function

This prepares the pwm-hibvt 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/7b12504b4128969bdc783bf2bff1ecc63b7c7bd4.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-hibvt.c b/drivers/pwm/pwm-hibvt.c
index f1039be0f4e4172ef5db556d4ddc507c3ccc8c1b..2eb0b13d4e1066ab5ddc797c5e7b263cc685fbe0 100644 (file)
--- a/drivers/pwm/pwm-hibvt.c
+++ b/drivers/pwm/pwm-hibvt.c
@@ -33,7 +33,6 @@
 #define PWM_DUTY_MASK       GENMASK(31, 0)
 
 struct hibvt_pwm_chip {
-       struct pwm_chip chip;
        struct clk *clk;
        void __iomem *base;
        struct reset_control *rstc;
@@ -65,7 +64,7 @@ static const struct hibvt_pwm_soc hi3559v100_soc_info = {
 
 static inline struct hibvt_pwm_chip *to_hibvt_pwm_chip(struct pwm_chip *chip)
 {
-       return container_of(chip, struct hibvt_pwm_chip, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 static void hibvt_pwm_set_bits(void __iomem *base, u32 offset,
@@ -191,12 +190,14 @@ static int hibvt_pwm_probe(struct platform_device *pdev)
 {
        const struct hibvt_pwm_soc *soc =
                                of_device_get_match_data(&pdev->dev);
+       struct pwm_chip *chip;
        struct hibvt_pwm_chip *hi_pwm_chip;
        int ret, i;
 
-       hi_pwm_chip = devm_kzalloc(&pdev->dev, sizeof(*hi_pwm_chip), GFP_KERNEL);
-       if (hi_pwm_chip == NULL)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, soc->num_pwms, sizeof(*hi_pwm_chip));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       hi_pwm_chip = to_hibvt_pwm_chip(chip);
 
        hi_pwm_chip->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(hi_pwm_chip->clk)) {
@@ -205,9 +206,7 @@ static int hibvt_pwm_probe(struct platform_device *pdev)
                return PTR_ERR(hi_pwm_chip->clk);
        }
 
-       hi_pwm_chip->chip.ops = &hibvt_pwm_ops;
-       hi_pwm_chip->chip.dev = &pdev->dev;
-       hi_pwm_chip->chip.npwm = soc->num_pwms;
+       chip->ops = &hibvt_pwm_ops;
        hi_pwm_chip->soc = soc;
 
        hi_pwm_chip->base = devm_platform_ioremap_resource(pdev, 0);
@@ -228,29 +227,28 @@ static int hibvt_pwm_probe(struct platform_device *pdev)
        msleep(30);
        reset_control_deassert(hi_pwm_chip->rstc);
 
-       ret = pwmchip_add(&hi_pwm_chip->chip);
+       ret = pwmchip_add(chip);
        if (ret < 0) {
                clk_disable_unprepare(hi_pwm_chip->clk);
                return ret;
        }
 
-       for (i = 0; i < hi_pwm_chip->chip.npwm; i++) {
+       for (i = 0; i < chip->npwm; i++) {
                hibvt_pwm_set_bits(hi_pwm_chip->base, PWM_CTRL_ADDR(i),
                                PWM_KEEP_MASK, (0x1 << PWM_KEEP_SHIFT));
        }
 
-       platform_set_drvdata(pdev, hi_pwm_chip);
+       platform_set_drvdata(pdev, chip);
 
        return 0;
 }
 
 static void hibvt_pwm_remove(struct platform_device *pdev)
 {
-       struct hibvt_pwm_chip *hi_pwm_chip;
-
-       hi_pwm_chip = platform_get_drvdata(pdev);
+       struct pwm_chip *chip = platform_get_drvdata(pdev);
+       struct hibvt_pwm_chip *hi_pwm_chip = to_hibvt_pwm_chip(chip);
 
-       pwmchip_remove(&hi_pwm_chip->chip);
+       pwmchip_remove(chip);
 
        reset_control_assert(hi_pwm_chip->rstc);
        msleep(30);