Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block

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

diff --git a/drivers/pwm/pwm-sl28cpld.c b/drivers/pwm/pwm-sl28cpld.c
index 7a69c1a..589aeaa 100644 (file)
--- a/drivers/pwm/pwm-sl28cpld.c
+++ b/drivers/pwm/pwm-sl28cpld.c
@@ -231,9 +231,7 @@ static int sl28cpld_pwm_probe(struct platform_device *pdev)
        chip->ops = &sl28cpld_pwm_ops;
        chip->npwm = 1;
 
-       platform_set_drvdata(pdev, priv);
-
-       ret = pwmchip_add(&priv->pwm_chip);
+       ret = devm_pwmchip_add(&pdev->dev, &priv->pwm_chip);
        if (ret) {
                dev_err(&pdev->dev, "failed to add PWM chip (%pe)",
                        ERR_PTR(ret));
@@ -243,13 +241,6 @@ static int sl28cpld_pwm_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int sl28cpld_pwm_remove(struct platform_device *pdev)
-{
-       struct sl28cpld_pwm *priv = platform_get_drvdata(pdev);
-
-       return pwmchip_remove(&priv->pwm_chip);
-}
-
 static const struct of_device_id sl28cpld_pwm_of_match[] = {
        { .compatible = "kontron,sl28cpld-pwm" },
        {}
@@ -258,7 +249,6 @@ MODULE_DEVICE_TABLE(of, sl28cpld_pwm_of_match);
 
 static struct platform_driver sl28cpld_pwm_driver = {
        .probe = sl28cpld_pwm_probe,
-       .remove = sl28cpld_pwm_remove,
        .driver = {
                .name = "sl28cpld-pwm",
                .of_match_table = sl28cpld_pwm_of_match,