backlight: platform_lcd: remove unnecessary ifdefs
Subsystems (2)
PATCH 1/2 backlight: platform_lcd: 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.
--- drivers/video/backlight/platform_lcd.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/video/backlight/platform_lcd.c +2 -4
@@ -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,
Signature · 1 line
1.7.2.5
PATCH 2/2 pwm_backlight: 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.
--- drivers/video/backlight/pwm_bl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/video/backlight/pwm_bl.c +2 -5
@@ -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,
Signature · 1 line
1.7.2.5
Thierry Reding
AppliedRe: [PATCH 2/2] pwm_backlight: remove unnecessary ifdefs
Quoted 9 lines · Jingoo Han
When the macro such as
SIMPLE_DEV_PM_OPSis used, there is no need to use '#ifdefCONFIG_PM' to prevent build error. Thus, this patch removes unnecessary ifdefs.Signed-off-by Jingoo Han <[email protected]>Cc Thierry Reding <[email protected]>--- 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