pwm: lpss-*: Make use of devm_pwmchip_alloc() function

This prepares the pwm-lpss drivers 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.

Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/b567ab5dd992e361eb884fa6c2cac11be9c7dde3.1707900770.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index d6f29e6faab79b9059f06b5ae7d933da4d28584c..89bd7ce6711a1361413de6e7f2e2013df9d687a1 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1492,7 +1492,7 @@ static int intel_pinctrl_probe_pwm(struct intel_pinctrl *pctrl,
                .base_unit_bits = 22,
                .bypass = true,
        };
-       struct pwm_lpss_chip *pwm;
+       struct pwm_chip *chip;
 
        if (!(community->features & PINCTRL_FEATURE_PWM))
                return 0;
@@ -1500,8 +1500,8 @@ static int intel_pinctrl_probe_pwm(struct intel_pinctrl *pctrl,
        if (!IS_REACHABLE(CONFIG_PWM_LPSS))
                return 0;
 
-       pwm = devm_pwm_lpss_probe(pctrl->dev, community->regs + PWMC, &info);
-       return PTR_ERR_OR_ZERO(pwm);
+       chip = devm_pwm_lpss_probe(pctrl->dev, community->regs + PWMC, &info);
+       return PTR_ERR_OR_ZERO(chip);
 }
 
 int intel_pinctrl_probe(struct platform_device *pdev,

diff --git a/drivers/pwm/pwm-lpss-pci.c b/drivers/pwm/pwm-lpss-pci.c
index 34acfe99b74fa1bccff6a8d985225eac3eac161a..25045c229520026c5affa9ac72a25458e6079f5e 100644 (file)
--- a/drivers/pwm/pwm-lpss-pci.c
+++ b/drivers/pwm/pwm-lpss-pci.c
@@ -18,7 +18,7 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
                              const struct pci_device_id *id)
 {
        const struct pwm_lpss_boardinfo *info;
-       struct pwm_lpss_chip *lpwm;
+       struct pwm_chip *chip;
        int err;
 
        err = pcim_enable_device(pdev);
@@ -30,9 +30,9 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
                return err;
 
        info = (struct pwm_lpss_boardinfo *)id->driver_data;
-       lpwm = devm_pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info);
-       if (IS_ERR(lpwm))
-               return PTR_ERR(lpwm);
+       chip = devm_pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info);
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
 
        pm_runtime_put(&pdev->dev);
        pm_runtime_allow(&pdev->dev);

diff --git a/drivers/pwm/pwm-lpss-platform.c b/drivers/pwm/pwm-lpss-platform.c
index 5f6ee300e3422549c988f6d3efd7b9487ee224da..dbc9f5b17bdc2f42594f732f499f8dc957f0ba0d 100644 (file)
--- a/drivers/pwm/pwm-lpss-platform.c
+++ b/drivers/pwm/pwm-lpss-platform.c
@@ -20,7 +20,7 @@
 static int pwm_lpss_probe_platform(struct platform_device *pdev)
 {
        const struct pwm_lpss_boardinfo *info;
-       struct pwm_lpss_chip *lpwm;
+       struct pwm_chip *chip;
        void __iomem *base;
 
        info = device_get_match_data(&pdev->dev);
@@ -31,9 +31,9 @@ static int pwm_lpss_probe_platform(struct platform_device *pdev)
        if (IS_ERR(base))
                return PTR_ERR(base);
 
-       lpwm = devm_pwm_lpss_probe(&pdev->dev, base, info);
-       if (IS_ERR(lpwm))
-               return PTR_ERR(lpwm);
+       chip = devm_pwm_lpss_probe(&pdev->dev, base, info);
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
 
        /*
         * On Cherry Trail devices the GFX0._PS0 AML checks if the controller

diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
index 394c768f5a5f7469feee4c1fbd6a1dde84604e71..867e2bc8c601c8eb66ee635b16d516c8d26d4b55 100644 (file)
--- a/drivers/pwm/pwm-lpss.c
+++ b/drivers/pwm/pwm-lpss.c
@@ -68,7 +68,7 @@ EXPORT_SYMBOL_GPL(pwm_lpss_tng_info);
 
 static inline struct pwm_lpss_chip *to_lpwm(struct pwm_chip *chip)
 {
-       return container_of(chip, struct pwm_lpss_chip, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 static inline u32 pwm_lpss_read(const struct pwm_device *pwm)
@@ -245,10 +245,11 @@ static const struct pwm_ops pwm_lpss_ops = {
        .get_state = pwm_lpss_get_state,
 };
 
-struct pwm_lpss_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base,
-                                         const struct pwm_lpss_boardinfo *info)
+struct pwm_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base,
+                                    const struct pwm_lpss_boardinfo *info)
 {
        struct pwm_lpss_chip *lpwm;
+       struct pwm_chip *chip;
        unsigned long c;
        int i, ret;
        u32 ctrl;
@@ -256,9 +257,10 @@ struct pwm_lpss_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base
        if (WARN_ON(info->npwm > LPSS_MAX_PWMS))
                return ERR_PTR(-ENODEV);
 
-       lpwm = devm_kzalloc(dev, sizeof(*lpwm), GFP_KERNEL);
-       if (!lpwm)
-               return ERR_PTR(-ENOMEM);
+       chip = devm_pwmchip_alloc(dev, info->npwm, sizeof(*lpwm));
+       if (IS_ERR(chip))
+               return chip;
+       lpwm = to_lpwm(chip);
 
        lpwm->regs = base;
        lpwm->info = info;
@@ -267,23 +269,21 @@ struct pwm_lpss_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base
        if (!c)
                return ERR_PTR(-EINVAL);
 
-       lpwm->chip.dev = dev;
-       lpwm->chip.ops = &pwm_lpss_ops;
-       lpwm->chip.npwm = info->npwm;
+       chip->ops = &pwm_lpss_ops;
 
-       ret = devm_pwmchip_add(dev, &lpwm->chip);
+       ret = devm_pwmchip_add(dev, chip);
        if (ret) {
                dev_err(dev, "failed to add PWM chip: %d\n", ret);
                return ERR_PTR(ret);
        }
 
        for (i = 0; i < lpwm->info->npwm; i++) {
-               ctrl = pwm_lpss_read(&lpwm->chip.pwms[i]);
+               ctrl = pwm_lpss_read(&chip->pwms[i]);
                if (ctrl & PWM_ENABLE)
                        pm_runtime_get(dev);
        }
 
-       return lpwm;
+       return chip;
 }
 EXPORT_SYMBOL_GPL(devm_pwm_lpss_probe);
 

diff --git a/drivers/pwm/pwm-lpss.h b/drivers/pwm/pwm-lpss.h
index bf841250385f6ad2e513c9ad06afcc96bd20a4e2..b5267ab5193b6e361a6b64b3c40657810827d192 100644 (file)
--- a/drivers/pwm/pwm-lpss.h
+++ b/drivers/pwm/pwm-lpss.h
@@ -18,7 +18,6 @@
 #define LPSS_MAX_PWMS                  4
 
 struct pwm_lpss_chip {
-       struct pwm_chip chip;
        void __iomem *regs;
        const struct pwm_lpss_boardinfo *info;
 };

diff --git a/include/linux/platform_data/x86/pwm-lpss.h b/include/linux/platform_data/x86/pwm-lpss.h
index c852fe24fe2a3e7575406b9e1fa4639be71a3bad..752c06b47cc85ee079a3f70d447ab35d8a6f5afb 100644 (file)
--- a/include/linux/platform_data/x86/pwm-lpss.h
+++ b/include/linux/platform_data/x86/pwm-lpss.h
@@ -27,7 +27,7 @@ struct pwm_lpss_boardinfo {
        bool other_devices_aml_touches_pwm_regs;
 };
 
-struct pwm_lpss_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base,
-                                         const struct pwm_lpss_boardinfo *info);
+struct pwm_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base,
+                                    const struct pwm_lpss_boardinfo *info);
 
 #endif /* __PLATFORM_DATA_X86_PWM_LPSS_H */