[<prev] [next>] [day] [month] [year] [list]
Message-ID: <1332313174-5374-1-git-send-email-shubhrajyoti@ti.com>
Date: Wed, 21 Mar 2012 12:29:34 +0530
From: Shubhrajyoti D <shubhrajyoti@...com>
To: <linux-omap@...r.kernel.org>
CC: <linux-usb@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<sameo@...ux.intel.com>, Shubhrajyoti D <shubhrajyoti@...com>
Subject: [PATCH v2] MFD: OMAP: USB: Make the runtime functions depend on CONFIG_PM_RUNTIME
Currently the runtime functions are compiled regardless
of CONFIG_PM_RUNTIME flag. This patch intends to fix the same by
using SET_RUNTIME_PM_OPS.
Reviewed-by: Kevin Hilman <khilman@...com>
Cc : Keshava Munegowda <keshava_mgowda@...com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@...com>
---
drivers/mfd/omap-usb-host.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 68ac2c5..f8fdd5f 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -422,6 +422,7 @@ static void usbhs_omap_tll_init(struct device *dev, u8 tll_channel_count)
}
}
+#ifdef CONFIG_PM_RUNTIME
static int usbhs_runtime_resume(struct device *dev)
{
struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
@@ -489,6 +490,7 @@ static int usbhs_runtime_suspend(struct device *dev)
return 0;
}
+#endif
static void omap_usbhs_init(struct device *dev)
{
@@ -881,8 +883,8 @@ static int __devexit usbhs_omap_remove(struct platform_device *pdev)
}
static const struct dev_pm_ops usbhsomap_dev_pm_ops = {
- .runtime_suspend = usbhs_runtime_suspend,
- .runtime_resume = usbhs_runtime_resume,
+ SET_RUNTIME_PM_OPS(usbhs_runtime_suspend,
+ usbhs_runtime_resume, NULL)
};
static struct platform_driver usbhs_omap_driver = {
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists