Merge tag 'vfs-6.13-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[J-linux.git] / drivers / pwm / pwm-stm32-lp.c

diff --git a/drivers/pwm/pwm-stm32-lp.c b/drivers/pwm/pwm-stm32-lp.c
index 958043bc5c9200494f98ef7485305c4567dd8db0..989731256f5030c5a1752e7d22e2251ff2a41c5b 100644 (file)
--- a/drivers/pwm/pwm-stm32-lp.c
+++ b/drivers/pwm/pwm-stm32-lp.c
@@ -18,14 +18,13 @@
 #include <linux/pwm.h>
 
 struct stm32_pwm_lp {
-       struct pwm_chip chip;
        struct clk *clk;
        struct regmap *regmap;
 };
 
 static inline struct stm32_pwm_lp *to_stm32_pwm_lp(struct pwm_chip *chip)
 {
-       return container_of(chip, struct stm32_pwm_lp, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 /* STM32 Low-Power Timer is preceded by a configurable power-of-2 prescaler */
@@ -200,16 +199,14 @@ static int stm32_pwm_lp_probe(struct platform_device *pdev)
        struct pwm_chip *chip;
        int ret;
 
-       priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, 1, sizeof(*priv));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       priv = to_stm32_pwm_lp(chip);
 
        priv->regmap = ddata->regmap;
        priv->clk = ddata->clk;
-       chip = &priv->chip;
-       chip->dev = &pdev->dev;
        chip->ops = &stm32_pwm_lp_ops;
-       chip->npwm = 1;
 
        ret = devm_pwmchip_add(&pdev->dev, chip);
        if (ret < 0)