drivers/video/backlight/platform_lcd.c: remove unnecessary ifdefs
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:17:26 +0000 (16:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:14 +0000 (18:28 -0700)
When the macro such as SIMPLE_DEV_PM_OPS is used, there is no need to
use '#ifdef CONFIG_PM' to prevent build error.  Thus, this patch removes
unnecessary ifdefs.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/backlight/platform_lcd.c

index 17a6b83f97afdab22abeb065a9c5876d92d3f5b9..54d94de652b0fa099832fed58cbc50ecb56722f6 100644 (file)
@@ -121,7 +121,7 @@ static int platform_lcd_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int platform_lcd_suspend(struct device *dev)
 {
        struct platform_lcd *plcd = dev_get_drvdata(dev);
@@ -141,10 +141,10 @@ static int platform_lcd_resume(struct device *dev)
 
        return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend,
                        platform_lcd_resume);
-#endif
 
 #ifdef CONFIG_OF
 static const struct of_device_id platform_lcd_of_match[] = {
@@ -158,9 +158,7 @@ static struct platform_driver platform_lcd_driver = {
        .driver         = {
                .name   = "platform-lcd",
                .owner  = THIS_MODULE,
-#ifdef CONFIG_PM
                .pm     = &platform_lcd_pm_ops,
-#endif
                .of_match_table = of_match_ptr(platform_lcd_of_match),
        },
        .probe          = platform_lcd_probe,