Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753891AbaB0TBt (ORCPT ); Thu, 27 Feb 2014 14:01:49 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:36951 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752435AbaB0TBr (ORCPT ); Thu, 27 Feb 2014 14:01:47 -0500 Date: Thu, 27 Feb 2014 11:03:24 -0800 From: Greg Kroah-Hartman To: Felipe Balbi Cc: Josh Cartwright , linux-pm@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/3] usb: phy: msm: use ASSIGN_*_PM_OPS variants Message-ID: <20140227190324.GC4421@kroah.com> References: <1393261707-30565-1-git-send-email-joshc@codeaurora.org> <1393261707-30565-4-git-send-email-joshc@codeaurora.org> <20140225183336.GH23275@saruman.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140225183336.GH23275@saruman.home> User-Agent: Mutt/1.5.22 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 25, 2014 at 12:33:36PM -0600, Felipe Balbi wrote: > Hi, > > On Mon, Feb 24, 2014 at 11:08:27AM -0600, Josh Cartwright wrote: > > Use ASSIGN_SYSTEM_SLEEP_PM_OPS and ASSIGN_RUNTIME_PM_OPS in the > > initializer for msm_otg_dev_pm_ops. Doing so allows us to eliminate > > preprocessor conditionals around the specified callbacks. > > > > Signed-off-by: Josh Cartwright > > --- > > drivers/usb/phy/phy-msm-usb.c | 13 +++---------- > > 1 file changed, 3 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c > > index 5b37b81..c04f2e3 100644 > > --- a/drivers/usb/phy/phy-msm-usb.c > > +++ b/drivers/usb/phy/phy-msm-usb.c > > @@ -414,8 +414,6 @@ 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 > > - > > #define USB_PHY_SUSP_DIG_VOL 500000 > > static int msm_hsusb_config_vddcx(int high) > > { > > @@ -609,7 +607,6 @@ skip_phy_resume: > > > > return 0; > > } > > -#endif > > > > static void msm_otg_notify_charger(struct msm_otg *motg, unsigned mA) > > { > > @@ -1664,7 +1661,6 @@ static int msm_otg_remove(struct platform_device *pdev) > > return 0; > > } > > > > -#ifdef CONFIG_PM_RUNTIME > > static int msm_otg_runtime_idle(struct device *dev) > > { > > struct msm_otg *motg = dev_get_drvdata(dev); > > @@ -1699,9 +1695,7 @@ static int msm_otg_runtime_resume(struct device *dev) > > dev_dbg(dev, "OTG runtime resume\n"); > > return msm_otg_resume(motg); > > } > > -#endif > > > > -#ifdef CONFIG_PM_SLEEP > > static int msm_otg_pm_suspend(struct device *dev) > > { > > struct msm_otg *motg = dev_get_drvdata(dev); > > @@ -1731,12 +1725,11 @@ static int msm_otg_pm_resume(struct device *dev) > > > > return 0; > > } > > -#endif > > > > 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) > > + ASSIGN_SYSTEM_SLEEP_PM_OPS(msm_otg_pm_suspend, msm_otg_pm_resume) > > + ASSIGN_RUNTIME_PM_OPS(msm_otg_runtime_suspend, msm_otg_runtime_resume, > > + msm_otg_runtime_idle) > > if the patch introducing assign_if() gets accepted, I'm ok with this > patch. I can't take that patch at this point in time, it's just too ugly... As are those crazy SET_SYSTEM_SLEEP_PM_OPS() macros, ick, who made those things? What language are we trying to program in here people? greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/