From: Jingoo Han Date: Wed, 20 Mar 2013 04:07:35 +0000 (+1100) Subject: drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix X-Git-Tag: next-20130321~2^2~292 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9387380f90e65dfc955c8b2fcadd92afbbe21798;p=karo-tx-linux.git drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix - Remove unnecessary ifdefs. Signed-off-by: Jingoo Han Signed-off-by: Andrew Morton --- diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c index 505d44682ddd..319fef6cb422 100644 --- a/drivers/video/backlight/ams369fg06.c +++ b/drivers/video/backlight/ams369fg06.c @@ -533,7 +533,7 @@ static int ams369fg06_remove(struct spi_device *spi) return 0; } -#if defined(CONFIG_PM) +#ifdef CONFIG_PM_SLEEP static int ams369fg06_suspend(struct device *dev) { struct ams369fg06 *lcd = dev_get_drvdata(dev); @@ -555,10 +555,10 @@ static int ams369fg06_resume(struct device *dev) return ams369fg06_power(lcd, FB_BLANK_UNBLANK); } +#endif static SIMPLE_DEV_PM_OPS(ams369fg06_pm_ops, ams369fg06_suspend, ams369fg06_resume); -#endif static void ams369fg06_shutdown(struct spi_device *spi) { @@ -571,9 +571,7 @@ static struct spi_driver ams369fg06_driver = { .driver = { .name = "ams369fg06", .owner = THIS_MODULE, -#ifdef CONFIG_PM .pm = &ams369fg06_pm_ops, -#endif }, .probe = ams369fg06_probe, .remove = ams369fg06_remove,