Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index a221808..766dbc5 100644 (file)
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -145,30 +145,18 @@ static int mxs_pwm_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = pwmchip_add(&mxs->chip);
+       /* FIXME: Only do this if the PWM isn't already running */
+       ret = stmp_reset_block(mxs->base);
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "failed to reset PWM\n");
+
+       ret = devm_pwmchip_add(&pdev->dev, &mxs->chip);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
                return ret;
        }
 
-       platform_set_drvdata(pdev, mxs);
-
-       ret = stmp_reset_block(mxs->base);
-       if (ret)
-               goto pwm_remove;
-
        return 0;
-
-pwm_remove:
-       pwmchip_remove(&mxs->chip);
-       return ret;
-}
-
-static int mxs_pwm_remove(struct platform_device *pdev)
-{
-       struct mxs_pwm_chip *mxs = platform_get_drvdata(pdev);
-
-       return pwmchip_remove(&mxs->chip);
 }
 
 static const struct of_device_id mxs_pwm_dt_ids[] = {
@@ -183,7 +171,6 @@ static struct platform_driver mxs_pwm_driver = {
                .of_match_table = mxs_pwm_dt_ids,
        },
        .probe = mxs_pwm_probe,
-       .remove = mxs_pwm_remove,
 };
 module_platform_driver(mxs_pwm_driver);