Merge tag 'landlock-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic...

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

diff --git a/drivers/pwm/pwm-bcm-iproc.c b/drivers/pwm/pwm-bcm-iproc.c
index 7582540..f4c9f10 100644 (file)
--- a/drivers/pwm/pwm-bcm-iproc.c
+++ b/drivers/pwm/pwm-bcm-iproc.c
@@ -34,14 +34,13 @@
 #define IPROC_PWM_PRESCALE_MAX                 0x3f
 
 struct iproc_pwmc {
-       struct pwm_chip chip;
        void __iomem *base;
        struct clk *clk;
 };
 
 static inline struct iproc_pwmc *to_iproc_pwmc(struct pwm_chip *chip)
 {
-       return container_of(chip, struct iproc_pwmc, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 static void iproc_pwmc_enable(struct iproc_pwmc *ip, unsigned int channel)
@@ -187,20 +186,20 @@ static const struct pwm_ops iproc_pwm_ops = {
 
 static int iproc_pwmc_probe(struct platform_device *pdev)
 {
+       struct pwm_chip *chip;
        struct iproc_pwmc *ip;
        unsigned int i;
        u32 value;
        int ret;
 
-       ip = devm_kzalloc(&pdev->dev, sizeof(*ip), GFP_KERNEL);
-       if (!ip)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, 4, sizeof(*ip));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       ip = to_iproc_pwmc(chip);
 
        platform_set_drvdata(pdev, ip);
 
-       ip->chip.dev = &pdev->dev;
-       ip->chip.ops = &iproc_pwm_ops;
-       ip->chip.npwm = 4;
+       chip->ops = &iproc_pwm_ops;
 
        ip->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(ip->base))
@@ -214,14 +213,14 @@ static int iproc_pwmc_probe(struct platform_device *pdev)
        /* Set full drive and normal polarity for all channels */
        value = readl(ip->base + IPROC_PWM_CTRL_OFFSET);
 
-       for (i = 0; i < ip->chip.npwm; i++) {
+       for (i = 0; i < chip->npwm; i++) {
                value &= ~(1 << IPROC_PWM_CTRL_TYPE_SHIFT(i));
                value |= 1 << IPROC_PWM_CTRL_POLARITY_SHIFT(i);
        }
 
        writel(value, ip->base + IPROC_PWM_CTRL_OFFSET);
 
-       ret = devm_pwmchip_add(&pdev->dev, &ip->chip);
+       ret = devm_pwmchip_add(&pdev->dev, chip);
        if (ret < 0)
                return dev_err_probe(&pdev->dev, ret,
                                     "failed to add PWM chip\n");