Subject: [PATCH RFCv2] MFD: OMAP: USB: Make the runtime functions depend on CONFIG_PM_RUNTIME

From: [email-masked] (Kevin Hilman)
Date: Mon, 09 Jan 2012 15:52:15 -0800

Shubhrajyoti D <[email-masked]> writes:

> 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-masked]>
> Signed-off-by: Shubhrajyoti D <[email-masked]>
> ---
> applies on Tony's ehci branch.
> Compile tested only.

Lookd right to me:

Reviewed-by: Kevin Hilman <[email-masked]>

>  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 3f565ef..2896d6b 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)
>  {
> @@ -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 = {