[PATCH v2] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP

[Felipe Balbi]

On Tue, Feb 18, 2014 at 10:33:21AM -0600, Josh Cartwright wrote:
> On Tue, Feb 18, 2014 at 10:24:16AM -0600, Felipe Balbi wrote:
> > On Fri, Jan 17, 2014 at 12:26:50PM -0600, Josh Cartwright wrote:
> > > On Fri, Jan 17, 2014 at 11:58:51AM -0600, Josh Cartwright wrote:
> > > > 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 <iivanov at mm-sol.com>
> > > > Reported-by: Russell King <rmk+kernel at arm.linux.org.uk>
> > > > Signed-off-by: Josh Cartwright <joshc at codeaurora.org>
> > > > ---
> > > > 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(-)
> > > > 
> > > > diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
> > > > index 8546c8d..5b169a7 100644
> > > > --- a/drivers/usb/phy/phy-msm-usb.c
> > > > +++ b/drivers/usb/phy/phy-msm-usb.c
> > > [..]
> > > > @@ -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.
> > 
> > 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 :-)

-- 
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>