Merge tag 'mtd/for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

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

diff --git a/drivers/pwm/pwm-sprd.c b/drivers/pwm/pwm-sprd.c
index 2e87666..4c76ca5 100644 (file)
--- a/drivers/pwm/pwm-sprd.c
+++ b/drivers/pwm/pwm-sprd.c
@@ -34,14 +34,12 @@ struct sprd_pwm_chn {
 
 struct sprd_pwm_chip {
        void __iomem *base;
-       struct device *dev;
-       struct pwm_chip chip;
        struct sprd_pwm_chn chn[SPRD_PWM_CHN_NUM];
 };
 
 static inline struct sprd_pwm_chip* sprd_pwm_from_chip(struct pwm_chip *chip)
 {
-       return container_of(chip, struct sprd_pwm_chip, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 /*
@@ -85,7 +83,7 @@ static int sprd_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
         */
        ret = clk_bulk_prepare_enable(SPRD_PWM_CHN_CLKS_NUM, chn->clks);
        if (ret) {
-               dev_err(spc->dev, "failed to enable pwm%u clocks\n",
+               dev_err(pwmchip_parent(chip), "failed to enable pwm%u clocks\n",
                        pwm->hwpwm);
                return ret;
        }
@@ -182,7 +180,7 @@ static int sprd_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
                        ret = clk_bulk_prepare_enable(SPRD_PWM_CHN_CLKS_NUM,
                                                      chn->clks);
                        if (ret) {
-                               dev_err(spc->dev,
+                               dev_err(pwmchip_parent(chip),
                                        "failed to enable pwm%u clocks\n",
                                        pwm->hwpwm);
                                return ret;
@@ -249,6 +247,7 @@ static int sprd_pwm_clk_init(struct device *dev,
 
 static int sprd_pwm_probe(struct platform_device *pdev)
 {
+       struct pwm_chip *chip;
        struct sprd_pwm_chip *spc;
        struct sprd_pwm_chn chn[SPRD_PWM_CHN_NUM];
        int ret, npwm;
@@ -257,22 +256,20 @@ static int sprd_pwm_probe(struct platform_device *pdev)
        if (npwm < 0)
                return npwm;
 
-       spc = devm_kzalloc(&pdev->dev, sizeof(*spc), GFP_KERNEL);
-       if (!spc)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, npwm, sizeof(*spc));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       spc = sprd_pwm_from_chip(chip);
 
        spc->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(spc->base))
                return PTR_ERR(spc->base);
 
-       spc->dev = &pdev->dev;
        memcpy(spc->chn, chn, sizeof(chn));
 
-       spc->chip.dev = &pdev->dev;
-       spc->chip.ops = &sprd_pwm_ops;
-       spc->chip.npwm = npwm;
+       chip->ops = &sprd_pwm_ops;
 
-       ret = devm_pwmchip_add(&pdev->dev, &spc->chip);
+       ret = devm_pwmchip_add(&pdev->dev, chip);
        if (ret)
                dev_err(&pdev->dev, "failed to add PWM chip\n");