From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Boyd Subject: Re: [PATCH] usb: phy: msm: fix possible build error Date: Tue, 18 Feb 2014 22:28:06 -0800 Message-ID: <20140219062805.GF14769@codeaurora.org> References: <1392784558-26854-1-git-send-email-balbi@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from smtp.codeaurora.org ([198.145.11.231]:34093 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750977AbaBSG2J (ORCPT ); Wed, 19 Feb 2014 01:28:09 -0500 Content-Disposition: inline In-Reply-To: <1392784558-26854-1-git-send-email-balbi@ti.com> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Felipe Balbi Cc: "Ivan T. Ivanov" , Peter Chen , Jingoo Han , Linux USB Mailing List , Josh Cartwright , linux-arm-msm@vger.kernel.org On 02/18, Felipe Balbi wrote: > This will fail builds on configs where > CONFIG_PM_RUNTIME=y and CONFIG_PM_SLEEP=n. > > Following build error will show up: > > drivers/usb/phy/phy-msm-usb.c: In function ???msm_otg_runtime_suspend???: > drivers/usb/phy/phy-msm-usb.c:1693:2: error: implicit declaration of \ > function ???msm_otg_suspend??? [-Werror=implicit-function-declaration] > return msm_otg_suspend(motg); > ^ > drivers/usb/phy/phy-msm-usb.c: In function ???msm_otg_runtime_resume???: > drivers/usb/phy/phy-msm-usb.c:1701:2: error: implicit declaration of \ > function ???msm_otg_resume??? [-Werror=implicit-function-declaration] > return msm_otg_resume(motg); > ^ > > This patch fixes the error by defining msm_otg_{suspend,resume} > whenever CONFIG_PM=y. > > Signed-off-by: Felipe Balbi I'm lost. Didn't Josh send a patch for this to you already? [1] https://patchwork.kernel.org/patch/3673401/ > --- > drivers/usb/phy/phy-msm-usb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c > index 64c9d14e..96f31aa 100644 > --- a/drivers/usb/phy/phy-msm-usb.c > +++ b/drivers/usb/phy/phy-msm-usb.c > @@ -159,7 +159,7 @@ put_3p3: > return rc; > } > > -#ifdef CONFIG_PM_SLEEP > +#ifdef CONFIG_PM > #define USB_PHY_SUSP_DIG_VOL 500000 > static int msm_hsusb_config_vddcx(int high) > { > @@ -440,7 +440,7 @@ 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 > static int msm_otg_suspend(struct msm_otg *motg) > { > struct usb_phy *phy = &motg->phy; > -- > 1.9.0 > -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation