Merge tag 'regmap-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-block.git] / drivers / pwm / pwm-rcar.c

diff --git a/drivers/pwm/pwm-rcar.c b/drivers/pwm/pwm-rcar.c
index cfe7dd1b448e1b15ce72b41cbaafd7b65703106c..5b2b8ecc354c4bfd03528c414d442f039c274129 100644 (file)
--- a/drivers/pwm/pwm-rcar.c
+++ b/drivers/pwm/pwm-rcar.c
@@ -254,50 +254,11 @@ static const struct of_device_id rcar_pwm_of_table[] = {
 };
 MODULE_DEVICE_TABLE(of, rcar_pwm_of_table);
 
-#ifdef CONFIG_PM_SLEEP
-static struct pwm_device *rcar_pwm_dev_to_pwm_dev(struct device *dev)
-{
-       struct rcar_pwm_chip *rcar_pwm = dev_get_drvdata(dev);
-       struct pwm_chip *chip = &rcar_pwm->chip;
-
-       return &chip->pwms[0];
-}
-
-static int rcar_pwm_suspend(struct device *dev)
-{
-       struct pwm_device *pwm = rcar_pwm_dev_to_pwm_dev(dev);
-
-       if (!test_bit(PWMF_REQUESTED, &pwm->flags))
-               return 0;
-
-       pm_runtime_put(dev);
-
-       return 0;
-}
-
-static int rcar_pwm_resume(struct device *dev)
-{
-       struct pwm_device *pwm = rcar_pwm_dev_to_pwm_dev(dev);
-       struct pwm_state state;
-
-       if (!test_bit(PWMF_REQUESTED, &pwm->flags))
-               return 0;
-
-       pm_runtime_get_sync(dev);
-
-       pwm_get_state(pwm, &state);
-
-       return rcar_pwm_apply(pwm->chip, pwm, &state);
-}
-#endif /* CONFIG_PM_SLEEP */
-static SIMPLE_DEV_PM_OPS(rcar_pwm_pm_ops, rcar_pwm_suspend, rcar_pwm_resume);
-
 static struct platform_driver rcar_pwm_driver = {
        .probe = rcar_pwm_probe,
        .remove = rcar_pwm_remove,
        .driver = {
                .name = "pwm-rcar",
-               .pm     = &rcar_pwm_pm_ops,
                .of_match_table = of_match_ptr(rcar_pwm_of_table),
        }
 };