[media] drxk_hard: use usleep_range()

[~andy/linux] / drivers / pwm / pwm-samsung.c

diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c
index 5207e6cd8648d0d89a7ecea039b930a6ff5cf6dc..a0ece50d70bbfebb954902c0ae8a64255f815053 100644 (file)
--- a/drivers/pwm/pwm-samsung.c
+++ b/drivers/pwm/pwm-samsung.c
@@ -289,10 +289,10 @@ static int s3c_pwm_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int s3c_pwm_suspend(struct platform_device *pdev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int s3c_pwm_suspend(struct device *dev)
 {
-       struct s3c_chip *s3c = platform_get_drvdata(pdev);
+       struct s3c_chip *s3c = dev_get_drvdata(dev);
 
        /* No one preserve these values during suspend so reset them
         * Otherwise driver leaves PWM unconfigured if same values
@@ -304,9 +304,9 @@ static int s3c_pwm_suspend(struct platform_device *pdev, pm_message_t state)
        return 0;
 }
 
-static int s3c_pwm_resume(struct platform_device *pdev)
+static int s3c_pwm_resume(struct device *dev)
 {
-       struct s3c_chip *s3c = platform_get_drvdata(pdev);
+       struct s3c_chip *s3c = dev_get_drvdata(dev);
        unsigned long tcon;
 
        /* Restore invertion */
@@ -316,21 +316,19 @@ static int s3c_pwm_resume(struct platform_device *pdev)
 
        return 0;
 }
-
-#else
-#define s3c_pwm_suspend NULL
-#define s3c_pwm_resume NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(s3c_pwm_pm_ops, s3c_pwm_suspend,
+                       s3c_pwm_resume);
+
 static struct platform_driver s3c_pwm_driver = {
        .driver         = {
                .name   = "s3c24xx-pwm",
                .owner  = THIS_MODULE,
+               .pm     = &s3c_pwm_pm_ops,
        },
        .probe          = s3c_pwm_probe,
        .remove         = s3c_pwm_remove,
-       .suspend        = s3c_pwm_suspend,
-       .resume         = s3c_pwm_resume,
 };
 
 static int __init pwm_init(void)