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

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

diff --git a/drivers/pwm/pwm-lpc18xx-sct.c b/drivers/pwm/pwm-lpc18xx-sct.c
index fe891fa..04b76d2 100644 (file)
--- a/drivers/pwm/pwm-lpc18xx-sct.c
+++ b/drivers/pwm/pwm-lpc18xx-sct.c
@@ -92,8 +92,6 @@ struct lpc18xx_pwm_data {
 };
 
 struct lpc18xx_pwm_chip {
-       struct device *dev;
-       struct pwm_chip chip;
        void __iomem *base;
        struct clk *pwm_clk;
        unsigned long clk_rate;
@@ -110,7 +108,7 @@ struct lpc18xx_pwm_chip {
 static inline struct lpc18xx_pwm_chip *
 to_lpc18xx_pwm_chip(struct pwm_chip *chip)
 {
-       return container_of(chip, struct lpc18xx_pwm_chip, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 static inline void lpc18xx_pwm_writel(struct lpc18xx_pwm_chip *lpc18xx_pwm,
@@ -198,7 +196,7 @@ static int lpc18xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 
        if (period_ns < lpc18xx_pwm->min_period_ns ||
            period_ns > lpc18xx_pwm->max_period_ns) {
-               dev_err(chip->dev, "period %d not in range\n", period_ns);
+               dev_err(pwmchip_parent(chip), "period %d not in range\n", period_ns);
                return -ERANGE;
        }
 
@@ -214,7 +212,7 @@ static int lpc18xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
         */
        if (requested_events > 2 && lpc18xx_pwm->period_ns != period_ns &&
            lpc18xx_pwm->period_ns) {
-               dev_err(chip->dev, "conflicting period requested for PWM %u\n",
+               dev_err(pwmchip_parent(chip), "conflicting period requested for PWM %u\n",
                        pwm->hwpwm);
                mutex_unlock(&lpc18xx_pwm->period_lock);
                return -EBUSY;
@@ -289,7 +287,7 @@ static int lpc18xx_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
                                    LPC18XX_PWM_EVENT_MAX);
 
        if (event >= LPC18XX_PWM_EVENT_MAX) {
-               dev_err(lpc18xx_pwm->dev,
+               dev_err(pwmchip_parent(chip),
                        "maximum number of simultaneous channels reached\n");
                return -EBUSY;
        }
@@ -349,16 +347,15 @@ MODULE_DEVICE_TABLE(of, lpc18xx_pwm_of_match);
 
 static int lpc18xx_pwm_probe(struct platform_device *pdev)
 {
+       struct pwm_chip *chip;
        struct lpc18xx_pwm_chip *lpc18xx_pwm;
        int ret;
        u64 val;
 
-       lpc18xx_pwm = devm_kzalloc(&pdev->dev, sizeof(*lpc18xx_pwm),
-                                  GFP_KERNEL);
-       if (!lpc18xx_pwm)
-               return -ENOMEM;
-
-       lpc18xx_pwm->dev = &pdev->dev;
+       chip = devm_pwmchip_alloc(&pdev->dev, LPC18XX_NUM_PWMS, sizeof(*lpc18xx_pwm));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       lpc18xx_pwm = to_lpc18xx_pwm_chip(chip);
 
        lpc18xx_pwm->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(lpc18xx_pwm->base))
@@ -389,9 +386,7 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev)
        lpc18xx_pwm->min_period_ns = DIV_ROUND_UP(NSEC_PER_SEC,
                                                  lpc18xx_pwm->clk_rate);
 
-       lpc18xx_pwm->chip.dev = &pdev->dev;
-       lpc18xx_pwm->chip.ops = &lpc18xx_pwm_ops;
-       lpc18xx_pwm->chip.npwm = LPC18XX_NUM_PWMS;
+       chip->ops = &lpc18xx_pwm_ops;
 
        /* SCT counter must be in unify (32 bit) mode */
        lpc18xx_pwm_writel(lpc18xx_pwm, LPC18XX_PWM_CONFIG,
@@ -423,21 +418,22 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev)
        val |= LPC18XX_PWM_PRE(0);
        lpc18xx_pwm_writel(lpc18xx_pwm, LPC18XX_PWM_CTRL, val);
 
-       ret = pwmchip_add(&lpc18xx_pwm->chip);
+       ret = pwmchip_add(chip);
        if (ret < 0)
                return dev_err_probe(&pdev->dev, ret, "pwmchip_add failed\n");
 
-       platform_set_drvdata(pdev, lpc18xx_pwm);
+       platform_set_drvdata(pdev, chip);
 
        return 0;
 }
 
 static void lpc18xx_pwm_remove(struct platform_device *pdev)
 {
-       struct lpc18xx_pwm_chip *lpc18xx_pwm = platform_get_drvdata(pdev);
+       struct pwm_chip *chip = platform_get_drvdata(pdev);
+       struct lpc18xx_pwm_chip *lpc18xx_pwm = to_lpc18xx_pwm_chip(chip);
        u32 val;
 
-       pwmchip_remove(&lpc18xx_pwm->chip);
+       pwmchip_remove(chip);
 
        val = lpc18xx_pwm_readl(lpc18xx_pwm, LPC18XX_PWM_CTRL);
        lpc18xx_pwm_writel(lpc18xx_pwm, LPC18XX_PWM_CTRL,