Skip to contentSkip to conversation

MFD: OMAP: USB: Make the runtime functions depend on CONFIG_PM_RUNTIME

RFC PATCH Superseded Shubhrajyoti D 2 participants 2 messages Jan 9, 2012

Subsystems (2)
Multifunction devices (MFD) OMAP2+ support
lore
Share & tools
lore

Shubhrajyoti D

author
#0 lore raw

RFC PATCH v2 1/1 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.

Cc Keshava Munegowda <[email protected]>
Signed-off-by Shubhrajyoti D <[email protected]>

---
applies on Tony's ehci branch.
Compile tested only.

 drivers/mfd/omap-usb-host.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/mfd/omap-usb-host.c +4 -2
index 3f565ef..2896d6b 100644
@@ -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)
 {

@@ -887,8 +889,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 = {
Signature · 1 line
1.7.1
#1 lore raw

RFC PATCH v2 1/1 MFD: OMAP: USB: Make the runtime functions depend on CONFIG_PM_RUNTIME

Quoted 9 lines · Shubhrajyoti D

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.

Cc Keshava Munegowda <[email protected]>
Signed-off-by Shubhrajyoti D <[email protected]>

---
applies on Tony's ehci branch.
Compile tested only.

Lookd right to me:

Reviewed-by Kevin Hilman <[email protected]>
Quoted 34 lines
 drivers/mfd/omap-usb-host.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/mfd/omap-usb-host.c +4 -2
index 3f565ef..2896d6b 100644
@@ -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)
 {

@@ -887,8 +889,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 = {