2013-06-27 12:56:27

by Yijing Wang

Subject: [PATCH 3/6] sound/pci:trivial: replace numeric with standard PM state macros

Use standard PM state macros PCI_Dx instead of numeric 0/1/2..

Signed-off-by: Yijing Wang <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Jiri Kosina <[email protected]>
Cc: Bill Pemberton <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
sound/pci/cs4281.c | 2 +-
sound/pci/ens1370.c | 2 +-
sound/pci/ymfpci/ymfpci_main.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 6a86950..2f6a4b6 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1312,7 +1312,7 @@ static int snd_cs4281_free(struct cs4281 *chip)
/* Sound System Power Management - Turn Everything OFF */
snd_cs4281_pokeBA0(chip, BA0_SSPM, 0);
/* PCI interface - D3 state */
- pci_set_power_state(chip->pci, 3);
+ pci_set_power_state(chip->pci, PCI_D3hot);

if (chip->irq >= 0)
free_irq(chip->irq, chip);
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index db2dc83..b30afd1 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1939,7 +1939,7 @@ static int snd_ensoniq_free(struct ensoniq *ensoniq)
#endif
if (ensoniq->irq >= 0)
synchronize_irq(ensoniq->irq);
- pci_set_power_state(ensoniq->pci, 3);
+ pci_set_power_state(ensoniq->pci, PCI_D3hot);
__hw_end:
#ifdef CHIP1370
if (ensoniq->dma_bug.area)
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 22056c5..d591c15 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2258,7 +2258,7 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip)
/* FIXME: temporarily disabled, otherwise we cannot fire up
* the chip again unless reboot. ACPI bug?
*/
- pci_set_power_state(chip->pci, 3);
+ pci_set_power_state(chip->pci, PCI_D3hot);
#endif

#ifdef CONFIG_PM_SLEEP
--
1.7.1

2013-06-27 13:05:41

by Takashi Iwai

Subject: Re: [PATCH 3/6] sound/pci:trivial: replace numeric with standard PM state macros

At Thu, 27 Jun 2013 20:55:11 +0800,
Yijing Wang wrote:
>
> Use standard PM state macros PCI_Dx instead of numeric 0/1/2..
>
> Signed-off-by: Yijing Wang <[email protected]>
> Cc: Jaroslav Kysela <[email protected]>
> Cc: Takashi Iwai <[email protected]>
> Cc: Jiri Kosina <[email protected]>
> Cc: Bill Pemberton <[email protected]>
> Cc: [email protected]
> Cc: [email protected]

Thanks, applied.


Takashi

> ---
> sound/pci/cs4281.c | 2 +-
> sound/pci/ens1370.c | 2 +-
> sound/pci/ymfpci/ymfpci_main.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
> index 6a86950..2f6a4b6 100644
> --- a/sound/pci/cs4281.c
> +++ b/sound/pci/cs4281.c
> @@ -1312,7 +1312,7 @@ static int snd_cs4281_free(struct cs4281 *chip)
> /* Sound System Power Management - Turn Everything OFF */
> snd_cs4281_pokeBA0(chip, BA0_SSPM, 0);
> /* PCI interface - D3 state */
> - pci_set_power_state(chip->pci, 3);
> + pci_set_power_state(chip->pci, PCI_D3hot);
>
> if (chip->irq >= 0)
> free_irq(chip->irq, chip);
> diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
> index db2dc83..b30afd1 100644
> --- a/sound/pci/ens1370.c
> +++ b/sound/pci/ens1370.c
> @@ -1939,7 +1939,7 @@ static int snd_ensoniq_free(struct ensoniq *ensoniq)
> #endif
> if (ensoniq->irq >= 0)
> synchronize_irq(ensoniq->irq);
> - pci_set_power_state(ensoniq->pci, 3);
> + pci_set_power_state(ensoniq->pci, PCI_D3hot);
> __hw_end:
> #ifdef CHIP1370
> if (ensoniq->dma_bug.area)
> diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
> index 22056c5..d591c15 100644
> --- a/sound/pci/ymfpci/ymfpci_main.c
> +++ b/sound/pci/ymfpci/ymfpci_main.c
> @@ -2258,7 +2258,7 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip)
> /* FIXME: temporarily disabled, otherwise we cannot fire up
> * the chip again unless reboot. ACPI bug?
> */
> - pci_set_power_state(chip->pci, 3);
> + pci_set_power_state(chip->pci, PCI_D3hot);
> #endif
>
> #ifdef CONFIG_PM_SLEEP
> --
> 1.7.1
>
>