Merge "adv7481: Remove conditional compilation for PM functions"

This commit is contained in:
Linux Build Service Account 2017-12-15 14:14:38 -08:00 committed by Gerrit - the friendly Code Review server
commit 0181952bf7

View file

@ -2449,7 +2449,6 @@ static int adv7481_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int adv7481_suspend(struct device *dev) static int adv7481_suspend(struct device *dev)
{ {
struct adv7481_state *state; struct adv7481_state *state;
@ -2487,10 +2486,6 @@ static int adv7481_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(adv7481_pm_ops, adv7481_suspend, adv7481_resume); static SIMPLE_DEV_PM_OPS(adv7481_pm_ops, adv7481_suspend, adv7481_resume);
#define ADV7481_PM_OPS (&adv7481_pm_ops) #define ADV7481_PM_OPS (&adv7481_pm_ops)
#else
#define ADV7481_PM_OPS NULL
#endif
static struct platform_driver adv7481_driver = { static struct platform_driver adv7481_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,