[PATCH] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
From: Kevin Hilman <hidden>
Date: 2014-01-17 17:54:14
Also in:
linux-arm-msm, lkml
Possibly related (same subject, not in this thread)
- 2014-01-17 · Re: [PATCH] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP · Christopher Covington <hidden>
- 2014-01-17 · [PATCH] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP · Josh Cartwright <hidden>
Josh Cartwright [off-list ref] writes:
Both the PM_RUNTIME and PM_SLEEP callbacks call into the common
msm_otg_{suspend,resume} routines, however these routines are only being
built when CONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also
depends on msm_hsusb_config_vddcx(), which is only built when
CONFIG_PM_SLEEP.
Fix the CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the
preprocessor conditional, and moving msm_hsusb_config_vddcx().
While we're here, eliminate the CONFIG_PM conditional for setting
up the dev_pm_ops.
This address the following errors Russell King has hit doing randconfig
builds:
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_suspend':
drivers/usb/phy/phy-msm-usb.c:1691:2: error: implicit declaration of function 'msm_otg_suspend'
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_resume':
drivers/usb/phy/phy-msm-usb.c:1699:2: error: implicit declaration of function 'msm_otg_resume'
Cc: Ivan T. Ivanov <redacted>
Reported-by: Russell King <redacted>
Signed-off-by: Josh Cartwright <redacted>[...]
quoted hunk
@@ -440,7 +414,32 @@ static int msm_otg_reset(struct usb_phy *phy) #define PHY_SUSPEND_TIMEOUT_USEC (500 * 1000) #define PHY_RESUME_TIMEOUT_USEC (100 * 1000) -#ifdef CONFIG_PM_SLEEP +#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)
nit: you should just use CONFIG_PM here since that is what it's for.
c.f. kernel/power/Kconfig:
config PM
def_bool y
depends on PM_SLEEP || PM_RUNTIME
Kevin