Merge tag 'char-misc-5.15-rc1-lkdtm' of git://git.kernel.org/pub/scm/linux/kernel...

[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 6c6e26d..54bd95a 100644 (file)
--- a/drivers/pwm/pwm-iqs620a.c
+++ b/drivers/pwm/pwm-iqs620a.c
@@ -189,7 +189,6 @@ static int iqs620_pwm_probe(struct platform_device *pdev)
        if (!iqs620_pwm)
                return -ENOMEM;
 
-       platform_set_drvdata(pdev, iqs620_pwm);
        iqs620_pwm->iqs62x = iqs62x;
 
        ret = regmap_read(iqs62x->regmap, IQS620_PWR_SETTINGS, &val);
@@ -224,31 +223,18 @@ static int iqs620_pwm_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = pwmchip_add(&iqs620_pwm->chip);
+       ret = devm_pwmchip_add(&pdev->dev, &iqs620_pwm->chip);
        if (ret)
                dev_err(&pdev->dev, "Failed to add device: %d\n", ret);
 
        return ret;
 }
 
-static int iqs620_pwm_remove(struct platform_device *pdev)
-{
-       struct iqs620_pwm_private *iqs620_pwm = platform_get_drvdata(pdev);
-       int ret;
-
-       ret = pwmchip_remove(&iqs620_pwm->chip);
-       if (ret)
-               dev_err(&pdev->dev, "Failed to remove device: %d\n", ret);
-
-       return ret;
-}
-
 static struct platform_driver iqs620_pwm_platform_driver = {
        .driver = {
                .name = "iqs620a-pwm",
        },
        .probe = iqs620_pwm_probe,
-       .remove = iqs620_pwm_remove,
 };
 module_platform_driver(iqs620_pwm_platform_driver);