Merge tag 'for-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

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

diff --git a/drivers/pwm/pwm-iqs620a.c b/drivers/pwm/pwm-iqs620a.c
index 378ab03..13e5e13 100644 (file)
--- a/drivers/pwm/pwm-iqs620a.c
+++ b/drivers/pwm/pwm-iqs620a.c
@@ -34,12 +34,17 @@
 
 struct iqs620_pwm_private {
        struct iqs62x_core *iqs62x;
-       struct pwm_chip chip;
+       struct device *dev;
        struct notifier_block notifier;
        struct mutex lock;
        unsigned int duty_scale;
 };
 
+static inline struct iqs620_pwm_private *iqs620_pwm_from_chip(struct pwm_chip *chip)
+{
+       return pwmchip_get_drvdata(chip);
+}
+
 static int iqs620_pwm_init(struct iqs620_pwm_private *iqs620_pwm,
                           unsigned int duty_scale)
 {
@@ -73,7 +78,7 @@ static int iqs620_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
        if (state->period < IQS620_PWM_PERIOD_NS)
                return -EINVAL;
 
-       iqs620_pwm = container_of(chip, struct iqs620_pwm_private, chip);
+       iqs620_pwm = iqs620_pwm_from_chip(chip);
 
        /*
         * The duty cycle generated by the device is calculated as follows:
@@ -109,7 +114,7 @@ static int iqs620_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
 {
        struct iqs620_pwm_private *iqs620_pwm;
 
-       iqs620_pwm = container_of(chip, struct iqs620_pwm_private, chip);
+       iqs620_pwm = iqs620_pwm_from_chip(chip);
 
        mutex_lock(&iqs620_pwm->lock);
 
@@ -155,7 +160,7 @@ static int iqs620_pwm_notifier(struct notifier_block *notifier,
        mutex_unlock(&iqs620_pwm->lock);
 
        if (ret) {
-               dev_err(iqs620_pwm->chip.dev,
+               dev_err(iqs620_pwm->dev,
                        "Failed to re-initialize device: %d\n", ret);
                return NOTIFY_BAD;
        }
@@ -176,21 +181,24 @@ static void iqs620_pwm_notifier_unregister(void *context)
        ret = blocking_notifier_chain_unregister(&iqs620_pwm->iqs62x->nh,
                                                 &iqs620_pwm->notifier);
        if (ret)
-               dev_err(iqs620_pwm->chip.dev,
+               dev_err(iqs620_pwm->dev,
                        "Failed to unregister notifier: %d\n", ret);
 }
 
 static int iqs620_pwm_probe(struct platform_device *pdev)
 {
        struct iqs62x_core *iqs62x = dev_get_drvdata(pdev->dev.parent);
+       struct pwm_chip *chip;
        struct iqs620_pwm_private *iqs620_pwm;
        unsigned int val;
        int ret;
 
-       iqs620_pwm = devm_kzalloc(&pdev->dev, sizeof(*iqs620_pwm), GFP_KERNEL);
-       if (!iqs620_pwm)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, 1, sizeof(*iqs620_pwm));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
 
+       iqs620_pwm = iqs620_pwm_from_chip(chip);
+       iqs620_pwm->dev = &pdev->dev;
        iqs620_pwm->iqs62x = iqs62x;
 
        ret = regmap_read(iqs62x->regmap, IQS620_PWR_SETTINGS, &val);
@@ -205,9 +213,7 @@ static int iqs620_pwm_probe(struct platform_device *pdev)
                iqs620_pwm->duty_scale = val + 1;
        }
 
-       iqs620_pwm->chip.dev = &pdev->dev;
-       iqs620_pwm->chip.ops = &iqs620_pwm_ops;
-       iqs620_pwm->chip.npwm = 1;
+       chip->ops = &iqs620_pwm_ops;
 
        mutex_init(&iqs620_pwm->lock);
 
@@ -225,7 +231,7 @@ static int iqs620_pwm_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = devm_pwmchip_add(&pdev->dev, &iqs620_pwm->chip);
+       ret = devm_pwmchip_add(&pdev->dev, chip);
        if (ret)
                dev_err(&pdev->dev, "Failed to add device: %d\n", ret);