2014-04-08 19:06:40

by Dylan Reid

Subject: [PATCH] ALSA: hda - Use runtime helper to check active state.

>From azx_interrupt, use the helper to check if the device is active
instead of checking the state. This will do the right thing if
runtime pm is disabled in addition to if the device is suspended.

Signed-off-by: Dylan Reid <[email protected]>
---
sound/pci/hda/hda_controller.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 97993e1..460fcf4 100644
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -1758,7 +1758,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id)

#ifdef CONFIG_PM_RUNTIME
if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
- if (chip->card->dev->power.runtime_status != RPM_ACTIVE)
+ if (!pm_runtime_active(chip->card->dev))
return IRQ_NONE;
#endif

--
1.8.1.3.605.g02339dd

2014-04-09 07:36:12

by Takashi Iwai

Subject: Re: [PATCH] ALSA: hda - Use runtime helper to check active state.

At Tue, 8 Apr 2014 12:06:18 -0700,
Dylan Reid wrote:
>
> >From azx_interrupt, use the helper to check if the device is active
> instead of checking the state. This will do the right thing if
> runtime pm is disabled in addition to if the device is suspended.
>
> Signed-off-by: Dylan Reid <[email protected]>

Thanks, applied.


Takashi

> ---
> sound/pci/hda/hda_controller.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
> index 97993e1..460fcf4 100644
> --- a/sound/pci/hda/hda_controller.c
> +++ b/sound/pci/hda/hda_controller.c
> @@ -1758,7 +1758,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id)
>
> #ifdef CONFIG_PM_RUNTIME
> if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> - if (chip->card->dev->power.runtime_status != RPM_ACTIVE)
> + if (!pm_runtime_active(chip->card->dev))
> return IRQ_NONE;
> #endif
>
> --
> 1.8.1.3.605.g02339dd
>