* [PATCH 1/2] backlight: platform_lcd: remove unnecessary ifdefs
@ 2013-02-25 8:13 Jingoo Han
2013-02-25 8:15 ` [PATCH 2/2] pwm_backlight: " Jingoo Han
0 siblings, 1 reply; 3+ messages in thread
From: Jingoo Han @ 2013-02-25 8:13 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: 'LKML', 'Richard Purdie', 'Jingoo Han'
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>
---
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 17a6b83..54d94de 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)
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,
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] pwm_backlight: remove unnecessary ifdefs
2013-02-25 8:13 [PATCH 1/2] backlight: platform_lcd: remove unnecessary ifdefs Jingoo Han
@ 2013-02-25 8:15 ` Jingoo Han
2013-02-26 8:57 ` Thierry Reding
0 siblings, 1 reply; 3+ messages in thread
From: Jingoo Han @ 2013-02-25 8:15 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: 'LKML', 'Richard Purdie',
'Thierry Reding', 'Jingoo Han'
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>
Cc: Thierry Reding <thierry.reding@avionic-design.de>
---
drivers/video/backlight/pwm_bl.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index fa00304..1fea627 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -274,7 +274,7 @@ static int pwm_backlight_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int pwm_backlight_suspend(struct device *dev)
{
struct backlight_device *bl = dev_get_drvdata(dev);
@@ -296,19 +296,16 @@ static int pwm_backlight_resume(struct device *dev)
backlight_update_status(bl);
return 0;
}
+#endif
static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend,
pwm_backlight_resume);
-#endif
-
static struct platform_driver pwm_backlight_driver = {
.driver = {
.name = "pwm-backlight",
.owner = THIS_MODULE,
-#ifdef CONFIG_PM
.pm = &pwm_backlight_pm_ops,
-#endif
.of_match_table = of_match_ptr(pwm_backlight_of_match),
},
.probe = pwm_backlight_probe,
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] pwm_backlight: remove unnecessary ifdefs
2013-02-25 8:15 ` [PATCH 2/2] pwm_backlight: " Jingoo Han
@ 2013-02-26 8:57 ` Thierry Reding
0 siblings, 0 replies; 3+ messages in thread
From: Thierry Reding @ 2013-02-26 8:57 UTC (permalink / raw)
To: Jingoo Han
Cc: 'Andrew Morton', 'LKML', 'Richard Purdie'
[-- Attachment #1: Type: text/plain, Size: 577 bytes --]
On Mon, Feb 25, 2013 at 05:15:47PM +0900, Jingoo Han wrote:
> 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>
> Cc: Thierry Reding <thierry.reding@avionic-design.de>
> ---
> drivers/video/backlight/pwm_bl.c | 7 ++-----
> 1 files changed, 2 insertions(+), 5 deletions(-)
Applied, thanks. I haven't been able to push it out yet, since
gitorious.org seems to have some downtime.
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-26 8:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-25 8:13 [PATCH 1/2] backlight: platform_lcd: remove unnecessary ifdefs Jingoo Han
2013-02-25 8:15 ` [PATCH 2/2] pwm_backlight: " Jingoo Han
2013-02-26 8:57 ` Thierry Reding
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox