diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:17:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:14 -0400 |
commit | 1d80d0fdf7e13f5f1f769f5279803c887be07693 (patch) | |
tree | 4c7e1316fba558255368421c5262f9b42689bfae | |
parent | ba3601a99fde549707f5f869c977c0072fee04e1 (diff) |
drivers/video/backlight/platform_lcd.c: remove unnecessary ifdefs
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>
-rw-r--r-- | drivers/video/backlight/platform_lcd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c index 17a6b83f97af..54d94de652b0 100644 --- a/drivers/video/backlight/platform_lcd.c +++ b/drivers/video/backlight/platform_lcd.c | |||
@@ -121,7 +121,7 @@ static int platform_lcd_remove(struct platform_device *pdev) | |||
121 | return 0; | 121 | return 0; |
122 | } | 122 | } |
123 | 123 | ||
124 | #ifdef CONFIG_PM | 124 | #ifdef CONFIG_PM_SLEEP |
125 | static int platform_lcd_suspend(struct device *dev) | 125 | static int platform_lcd_suspend(struct device *dev) |
126 | { | 126 | { |
127 | struct platform_lcd *plcd = dev_get_drvdata(dev); | 127 | struct platform_lcd *plcd = dev_get_drvdata(dev); |
@@ -141,10 +141,10 @@ static int platform_lcd_resume(struct device *dev) | |||
141 | 141 | ||
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | #endif | ||
144 | 145 | ||
145 | static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend, | 146 | static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend, |
146 | platform_lcd_resume); | 147 | platform_lcd_resume); |
147 | #endif | ||
148 | 148 | ||
149 | #ifdef CONFIG_OF | 149 | #ifdef CONFIG_OF |
150 | static const struct of_device_id platform_lcd_of_match[] = { | 150 | static const struct of_device_id platform_lcd_of_match[] = { |
@@ -158,9 +158,7 @@ static struct platform_driver platform_lcd_driver = { | |||
158 | .driver = { | 158 | .driver = { |
159 | .name = "platform-lcd", | 159 | .name = "platform-lcd", |
160 | .owner = THIS_MODULE, | 160 | .owner = THIS_MODULE, |
161 | #ifdef CONFIG_PM | ||
162 | .pm = &platform_lcd_pm_ops, | 161 | .pm = &platform_lcd_pm_ops, |
163 | #endif | ||
164 | .of_match_table = of_match_ptr(platform_lcd_of_match), | 162 | .of_match_table = of_match_ptr(platform_lcd_of_match), |
165 | }, | 163 | }, |
166 | .probe = platform_lcd_probe, | 164 | .probe = platform_lcd_probe, |