Merge tag 'regmap-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / drivers / pwm / pwm-mtk-disp.c

diff --git a/drivers/pwm/pwm-mtk-disp.c b/drivers/pwm/pwm-mtk-disp.c
index 186aa5c..bafd6b6 100644 (file)
--- a/drivers/pwm/pwm-mtk-disp.c
+++ b/drivers/pwm/pwm-mtk-disp.c
@@ -42,7 +42,6 @@ struct mtk_pwm_data {
 };
 
 struct mtk_disp_pwm {
-       struct pwm_chip chip;
        const struct mtk_pwm_data *data;
        struct clk *clk_main;
        struct clk *clk_mm;
@@ -52,7 +51,7 @@ struct mtk_disp_pwm {
 
 static inline struct mtk_disp_pwm *to_mtk_disp_pwm(struct pwm_chip *chip)
 {
-       return container_of(chip, struct mtk_disp_pwm, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 static void mtk_disp_pwm_update_bits(struct mtk_disp_pwm *mdp, u32 offset,
@@ -231,12 +230,14 @@ static const struct pwm_ops mtk_disp_pwm_ops = {
 
 static int mtk_disp_pwm_probe(struct platform_device *pdev)
 {
+       struct pwm_chip *chip;
        struct mtk_disp_pwm *mdp;
        int ret;
 
-       mdp = devm_kzalloc(&pdev->dev, sizeof(*mdp), GFP_KERNEL);
-       if (!mdp)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, 1, sizeof(*mdp));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       mdp = to_mtk_disp_pwm(chip);
 
        mdp->data = of_device_get_match_data(&pdev->dev);
 
@@ -254,11 +255,9 @@ static int mtk_disp_pwm_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, PTR_ERR(mdp->clk_mm),
                                     "Failed to get mm clock\n");
 
-       mdp->chip.dev = &pdev->dev;
-       mdp->chip.ops = &mtk_disp_pwm_ops;
-       mdp->chip.npwm = 1;
+       chip->ops = &mtk_disp_pwm_ops;
 
-       ret = devm_pwmchip_add(&pdev->dev, &mdp->chip);
+       ret = devm_pwmchip_add(&pdev->dev, chip);
        if (ret < 0)
                return dev_err_probe(&pdev->dev, ret, "pwmchip_add() failed\n");