Randconfig build failure: screwed dependencies for phy-msm-usb.c
Subsystems (2)
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'
#ifdef CONFIG_PM_SLEEP
static int msm_otg_suspend(struct msm_otg *motg)
{
...
}
static int msm_otg_resume(struct msm_otg *motg) {
...
}
#endif
...
#ifdef CONFIG_PM_RUNTIME
...
static int msm_otg_runtime_suspend(struct device *dev)
{
struct msm_otg *motg = dev_get_drvdata(dev);
dev_dbg(dev, "OTG runtime suspend\n");
return msm_otg_suspend(motg);
}static int msm_otg_runtime_resume(struct device *dev)
{
struct msm_otg *motg = dev_get_drvdata(dev);
dev_dbg(dev, "OTG runtime resume\n");
return msm_otg_resume(motg);
}#endif
So, if runtime PM is enabled, but PM sleep isn't, this fails as above. If the msm_otg_* functions are required for runtime PM, they shouldn't be conditional on CONfIG_PM_SLEEP.
Signature · 3 lines
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up. Estimation in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad. Estimate before purchase was "up to 13.2Mbit".
PATCH 1/1 usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
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'
--- drivers/usb/phy/phy-msm-usb.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-)
drivers/usb/phy/phy-msm-usb.c +26 -31
@@ -159,32 +159,6 @@ put_3p3:return rc; } -#ifdef CONFIG_PM_SLEEP -#define USB_PHY_SUSP_DIG_VOL 500000 -static int msm_hsusb_config_vddcx (int high) -{ -int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; -int min_vol; -int ret; - -if (high) - min_vol =USB_PHY_VDD_DIG_VOL_MIN ; -else - min_vol =USB_PHY_SUSP_DIG_VOL ; - - ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); -if (ret) { -pr_err ("%s: unable to set the voltage for regulator " -"HSUSB_VDDCX\n" , __func__); -return ret; - } - -pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); - -return ret; -} -#endif -static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -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 ) + +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator " +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +static int msm_otg_suspend (struct msm_otg *motg) {struct usb_phy *phy = &motg->phy;
@@ -1733,22 +1732,18 @@ static int msm_otg_pm_resume(struct device *dev) }#endif -#ifdef CONFIG_PM static const struct dev_pm_ops msm_otg_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(msm_otg_pm_suspend, msm_otg_pm_resume)SET_RUNTIME_PM_OPS (msm_otg_runtime_suspend, msm_otg_runtime_resume, msm_otg_runtime_idle) }; -#endif static struct platform_driver msm_otg_driver = { .remove = msm_otg_remove, .driver = { .name =DRIVER_NAME , .owner =THIS_MODULE , -#ifdef CONFIG_PM .pm = &msm_otg_dev_pm_ops, -#endif }, };
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
Hi Josh,
On 01/17/2014 12:26 PM, Josh Cartwright wrote:
[...]
drivers/usb/phy/phy-msm-usb.c static int msm_otg_reset(struct usb_phy *phy) · line 417
Quoted 6 lines
drivers/usb/phy/phy-msm-usb.c +1
-1@@ -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 )
Why not #ifdef CONFIG_PM here?
Regards,
Christopher
Signature · 3 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation.
Re: [PATCH] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
In reply to Josh CartwrightQuoted 23 lines · Josh Cartwright
Both the
PM_RUNTIMEandPM_SLEEPcallbacks call into the common msm_otg_{suspend,resume} routines, however these routines are only being built whenCONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also depends onmsm_hsusb_config_vddcx(), which is only built whenCONFIG_PM_SLEEP.Fix the
CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the preprocessor conditional, and movingmsm_hsusb_config_vddcx().While we're here, eliminate the
CONFIG_PMconditional for setting up thedev_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 <[email protected]>Reported-by Russell King <[email protected]>Signed-off-by Josh Cartwright <[email protected]>
[...]
drivers/usb/phy/phy-msm-usb.c static int msm_otg_reset(struct usb_phy *phy) · line 417
Quoted 6 lines
drivers/usb/phy/phy-msm-usb.c +1
-1@@ -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_RUNTIMEKevin
PATCH v2 1/1 usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
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'
---v1->v2: Change conditional to simply CONFIG_PM (thanks ccov and khilman!)
drivers/usb/phy/phy-msm-usb.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-)
drivers/usb/phy/phy-msm-usb.c +26 -31
@@ -159,32 +159,6 @@ put_3p3:return rc; } -#ifdef CONFIG_PM_SLEEP -#define USB_PHY_SUSP_DIG_VOL 500000 -static int msm_hsusb_config_vddcx (int high) -{ -int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; -int min_vol; -int ret; - -if (high) - min_vol =USB_PHY_VDD_DIG_VOL_MIN ; -else - min_vol =USB_PHY_SUSP_DIG_VOL ; - - ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); -if (ret) { -pr_err ("%s: unable to set the voltage for regulator " -"HSUSB_VDDCX\n" , __func__); -return ret; - } - -pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); - -return ret; -} -#endif -static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -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 CONFIG_PM + +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator " +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +static int msm_otg_suspend (struct msm_otg *motg) {struct usb_phy *phy = &motg->phy;
@@ -1733,22 +1732,18 @@ static int msm_otg_pm_resume(struct device *dev) }#endif -#ifdef CONFIG_PM static const struct dev_pm_ops msm_otg_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(msm_otg_pm_suspend, msm_otg_pm_resume)SET_RUNTIME_PM_OPS (msm_otg_runtime_suspend, msm_otg_runtime_resume, msm_otg_runtime_idle) }; -#endif static struct platform_driver msm_otg_driver = { .remove = msm_otg_remove, .driver = { .name =DRIVER_NAME , .owner =THIS_MODULE , -#ifdef CONFIG_PM .pm = &msm_otg_dev_pm_ops, -#endif }, };
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
Quoted 33 lines · Josh Cartwright
Both the
PM_RUNTIMEandPM_SLEEPcallbacks call into the common msm_otg_{suspend,resume} routines, however these routines are only being built whenCONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also depends onmsm_hsusb_config_vddcx(), which is only built whenCONFIG_PM_SLEEP.Fix the
CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the preprocessor conditional, and movingmsm_hsusb_config_vddcx().While we're here, eliminate the
CONFIG_PMconditional for setting up thedev_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 <[email protected]>Reported-by Russell King <[email protected]>Signed-off-by Josh Cartwright <[email protected]>---
v1->v2: Change conditional to simplyCONFIG_PM(thanks ccov and khilman!)drivers/usb/phy/phy-msm-usb.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-)drivers/usb/phy/phy-msm-usb.c +0
-0
[..]
drivers/usb/phy/phy-msm-usb.c static int msm_otg_reset(struct usb_phy *phy) · line 417
Quoted 6 lines
drivers/usb/phy/phy-msm-usb.c +1
-1@@ -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 CONFIG_PM
*sigh*. This, of course, should have been #ifdef CONFIG_PM. Fixed v3 below.
Thanks,
Josh
-- 8< --
Subject: [PATCH v3] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
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'
--- drivers/usb/phy/phy-msm-usb.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-)
drivers/usb/phy/phy-msm-usb.c +26 -31
@@ -159,32 +159,6 @@ put_3p3:return rc; } -#ifdef CONFIG_PM_SLEEP -#define USB_PHY_SUSP_DIG_VOL 500000 -static int msm_hsusb_config_vddcx (int high) -{ -int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; -int min_vol; -int ret; - -if (high) - min_vol =USB_PHY_VDD_DIG_VOL_MIN ; -else - min_vol =USB_PHY_SUSP_DIG_VOL ; - - ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); -if (ret) { -pr_err ("%s: unable to set the voltage for regulator " -"HSUSB_VDDCX\n" , __func__); -return ret; - } - -pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); - -return ret; -} -#endif -static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -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 +#ifdef CONFIG_PM + +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator " +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +static int msm_otg_suspend (struct msm_otg *motg) {struct usb_phy *phy = &motg->phy;
@@ -1733,22 +1732,18 @@ static int msm_otg_pm_resume(struct device *dev) }#endif -#ifdef CONFIG_PM static const struct dev_pm_ops msm_otg_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(msm_otg_pm_suspend, msm_otg_pm_resume)SET_RUNTIME_PM_OPS (msm_otg_runtime_suspend, msm_otg_runtime_resume, msm_otg_runtime_idle) }; -#endif static struct platform_driver msm_otg_driver = { .remove = msm_otg_remove, .driver = { .name =DRIVER_NAME , .owner =THIS_MODULE , -#ifdef CONFIG_PM .pm = &msm_otg_dev_pm_ops, -#endif }, };
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
Quoted 39 lines · Josh Cartwright
Quoted 33 lines · Josh Cartwright
Both the
PM_RUNTIMEandPM_SLEEPcallbacks call into the common msm_otg_{suspend,resume} routines, however these routines are only being built whenCONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also depends onmsm_hsusb_config_vddcx(), which is only built whenCONFIG_PM_SLEEP.Fix the
CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the preprocessor conditional, and movingmsm_hsusb_config_vddcx().While we're here, eliminate the
CONFIG_PMconditional for setting up thedev_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 <[email protected]>Reported-by Russell King <[email protected]>Signed-off-by Josh Cartwright <[email protected]>---
v1->v2: Change conditional to simplyCONFIG_PM(thanks ccov and khilman!)drivers/usb/phy/phy-msm-usb.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-)drivers/usb/phy/phy-msm-usb.c +0
-0[..]
Quoted 4 lines
drivers/usb/phy/phy-msm-usb.c +0
-0@@ -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)
Quoted 5 lines
drivers/usb/phy/phy-msm-usb.c static int msm_otg_reset(struct usb_phy *phy) · line 417
Quoted 2 lines
drivers/usb/phy/phy-msm-usb.c +1
-1-#ifdef CONFIG_PM_SLEEP +#if CONFIG_PM *sigh*. This, of course, should have been #ifdef
CONFIG_PM. Fixed v3 below.
sorry, please git send-email it properly.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140218/3f152bfa/attachment.sig>
Re: [PATCH v2] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
Quoted 40 lines · Felipe Balbi
Quoted 39 lines · Josh Cartwright
Quoted 33 lines · Josh Cartwright
Both the
PM_RUNTIMEandPM_SLEEPcallbacks call into the common msm_otg_{suspend,resume} routines, however these routines are only being built whenCONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also depends onmsm_hsusb_config_vddcx(), which is only built whenCONFIG_PM_SLEEP.Fix the
CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the preprocessor conditional, and movingmsm_hsusb_config_vddcx().While we're here, eliminate the
CONFIG_PMconditional for setting up thedev_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 <[email protected]>Reported-by Russell King <[email protected]>Signed-off-by Josh Cartwright <[email protected]>---
v1->v2: Change conditional to simplyCONFIG_PM(thanks ccov and khilman!)drivers/usb/phy/phy-msm-usb.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-)drivers/usb/phy/phy-msm-usb.c +0
-0[..]
Quoted 4 lines
drivers/usb/phy/phy-msm-usb.c +0
-0@@ -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)
Quoted 7 lines
Quoted 5 lines
drivers/usb/phy/phy-msm-usb.c static int msm_otg_reset(struct usb_phy *phy) · line 417
Quoted 2 lines
drivers/usb/phy/phy-msm-usb.c +1
-1-#ifdef CONFIG_PM_SLEEP +#if CONFIG_PM *sigh*. This, of course, should have been #ifdef
CONFIG_PM. Fixed v3 below.sorry, please git send-email it properly.
No problem, will do. FWIW, it's applicable with git am --scissors.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
Quoted 47 lines · Josh Cartwright
Quoted 46 lines · Felipe Balbi
Quoted 44 lines · Josh Cartwright
Quoted 33 lines · Josh Cartwright
Both the
PM_RUNTIMEandPM_SLEEPcallbacks call into the common msm_otg_{suspend,resume} routines, however these routines are only being built whenCONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also depends onmsm_hsusb_config_vddcx(), which is only built whenCONFIG_PM_SLEEP.Fix the
CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the preprocessor conditional, and movingmsm_hsusb_config_vddcx().While we're here, eliminate the
CONFIG_PMconditional for setting up thedev_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 <[email protected]>Reported-by Russell King <[email protected]>Signed-off-by Josh Cartwright <[email protected]>---
v1->v2: Change conditional to simplyCONFIG_PM(thanks ccov and khilman!)drivers/usb/phy/phy-msm-usb.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-)drivers/usb/phy/phy-msm-usb.c +0
-0[..]
drivers/usb/phy/phy-msm-usb.c static int msm_otg_reset(struct usb_phy *phy) · line 417
Quoted 6 lines
drivers/usb/phy/phy-msm-usb.c +1
-1@@ -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 CONFIG_PM *sigh*. This, of course, should have been #ifdef
CONFIG_PM. Fixed v3 below.
Quoted 3 lines
Quoted 1 line
sorry, please git send-email it properly.
No problem, will do. FWIW, it's applicable with git am --scissors.
ahaa, I didn't know about that option. Thanks :-)
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140218/78fd0eaf/attachment.sig>
PATCH RESEND v3 1/1 usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
In reply to Josh CartwrightBoth 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'
--- drivers/usb/phy/phy-msm-usb.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-)
drivers/usb/phy/phy-msm-usb.c +26 -31
@@ -159,32 +159,6 @@ put_3p3:return rc; } -#ifdef CONFIG_PM_SLEEP -#define USB_PHY_SUSP_DIG_VOL 500000 -static int msm_hsusb_config_vddcx (int high) -{ -int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; -int min_vol; -int ret; - -if (high) - min_vol =USB_PHY_VDD_DIG_VOL_MIN ; -else - min_vol =USB_PHY_SUSP_DIG_VOL ; - - ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); -if (ret) { -pr_err ("%s: unable to set the voltage for regulator " -"HSUSB_VDDCX\n" , __func__); -return ret; - } - -pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); - -return ret; -} -#endif -static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -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 +#ifdef CONFIG_PM + +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator " +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +static int msm_otg_suspend (struct msm_otg *motg) {struct usb_phy *phy = &motg->phy;
@@ -1734,22 +1733,18 @@ static int msm_otg_pm_resume(struct device *dev) }#endif -#ifdef CONFIG_PM static const struct dev_pm_ops msm_otg_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(msm_otg_pm_suspend, msm_otg_pm_resume)SET_RUNTIME_PM_OPS (msm_otg_runtime_suspend, msm_otg_runtime_resume, msm_otg_runtime_idle) }; -#endif static struct platform_driver msm_otg_driver = { .remove = msm_otg_remove, .driver = { .name =DRIVER_NAME , .owner =THIS_MODULE , -#ifdef CONFIG_PM .pm = &msm_otg_dev_pm_ops, -#endif }, };
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation