linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mfd: rtsx: Fix build warnings for !PM
@ 2014-10-02  7:25 Thierry Reding
  2014-10-07  9:12 ` Lee Jones
  0 siblings, 1 reply; 2+ messages in thread
From: Thierry Reding @ 2014-10-02  7:25 UTC (permalink / raw)
  To: Lee Jones; +Cc: Samuel Ortiz, linux-kernel

From: Thierry Reding <treding@nvidia.com>

rtsx_pci_power_off() is called only from rtsx_pci_suspend(), which isn't
built when PM is disabled.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/mfd/rtsx_pcr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index f2643c221d34..30f7ca89a0e6 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -947,6 +947,7 @@ static void rtsx_pci_idle_work(struct work_struct *work)
 	mutex_unlock(&pcr->pcr_mutex);
 }
 
+#ifdef CONFIG_PM
 static void rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)
 {
 	if (pcr->ops->turn_off_led)
@@ -961,6 +962,7 @@ static void rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)
 	if (pcr->ops->force_power_down)
 		pcr->ops->force_power_down(pcr, pm_state);
 }
+#endif
 
 static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
 {
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] mfd: rtsx: Fix build warnings for !PM
  2014-10-02  7:25 [PATCH] mfd: rtsx: Fix build warnings for !PM Thierry Reding
@ 2014-10-07  9:12 ` Lee Jones
  0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2014-10-07  9:12 UTC (permalink / raw)
  To: Thierry Reding; +Cc: Samuel Ortiz, linux-kernel

On Thu, 02 Oct 2014, Thierry Reding wrote:

> From: Thierry Reding <treding@nvidia.com>
> 
> rtsx_pci_power_off() is called only from rtsx_pci_suspend(), which isn't
> built when PM is disabled.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  drivers/mfd/rtsx_pcr.c | 2 ++
>  1 file changed, 2 insertions(+)

Applied to fixes.

> diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
> index f2643c221d34..30f7ca89a0e6 100644
> --- a/drivers/mfd/rtsx_pcr.c
> +++ b/drivers/mfd/rtsx_pcr.c
> @@ -947,6 +947,7 @@ static void rtsx_pci_idle_work(struct work_struct *work)
>  	mutex_unlock(&pcr->pcr_mutex);
>  }
>  
> +#ifdef CONFIG_PM
>  static void rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)
>  {
>  	if (pcr->ops->turn_off_led)
> @@ -961,6 +962,7 @@ static void rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)
>  	if (pcr->ops->force_power_down)
>  		pcr->ops->force_power_down(pcr, pm_state);
>  }
> +#endif
>  
>  static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
>  {

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-10-07  9:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-02  7:25 [PATCH] mfd: rtsx: Fix build warnings for !PM Thierry Reding
2014-10-07  9:12 ` Lee Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).