Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / arch / arm / plat-samsung / adc.c

diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index 42bac8d5ab5d9166fb3567f8574fd7bc7d2bb6bf..2da35735fa388fae33a5ed705ef5f5b1a9fdcaa8 100644 (file)
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -413,8 +413,7 @@ static int s3c_adc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int s3c_adc_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct adc_device *adc = platform_get_drvdata(pdev);
+       struct adc_device *adc = dev_get_drvdata(dev);
        unsigned long flags;
        u32 con;