---------------------
PatchSet 3090 
Date: 2005/04/04 16:27:07
Author: tiwai
Branch: HEAD
Tag: (none) 
Log:
Summary: fix pm_message_t vs. u32 in alsa

I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately
that turned out not to be the case as Russel King pointed out. This
fixes last few bits in alsa. [These patches are independend and change
no object code; therefore not numbered].

Signed-off-by: Pavel Machek <pavel@suse.cz>

Members: 
	core/init.c:1.60->1.61 
	pci/atiixp_modem.c:1.15->1.16 

Index: /sound/core/init.c
diff -u /sound/core/init.c.old /sound/core/init.c
--- /sound/core/init.c.old	Fri Jan 28 12:18:39 2005
+++ /sound/core/init.c	Mon Apr  4 08:27:07 2005
@@ -744,7 +744,7 @@
 
 #define SND_GENERIC_NAME	"snd_generic_pm"
 
-static int snd_generic_suspend(struct device *dev, u32 state, u32 level);
+static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level);
 static int snd_generic_resume(struct device *dev, u32 level);
 
 static struct device_driver snd_generic_driver = {
@@ -800,7 +800,7 @@
 }
 
 /* suspend/resume callbacks for snd_generic platform device */
-static int snd_generic_suspend(struct device *dev, u32 state, u32 level)
+static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level)
 {
 	snd_card_t *card;
 
Index: /sound/pci/atiixp_modem.c
diff -u /sound/pci/atiixp_modem.c.old /sound/pci/atiixp_modem.c
--- /sound/pci/atiixp_modem.c.old	Fri Jan 28 11:34:06 2005
+++ /sound/pci/atiixp_modem.c	Mon Apr  4 08:27:08 2005
@@ -1121,7 +1121,7 @@
 	snd_atiixp_aclink_down(chip);
 	snd_atiixp_chip_stop(chip);
 
-	pci_set_power_state(chip->pci, 3);
+	pci_set_power_state(chip->pci, PCI_D3hot);
 	pci_disable_device(chip->pci);
 	return 0;
 }
@@ -1132,7 +1132,7 @@
 	int i;
 
 	pci_enable_device(chip->pci);
-	pci_set_power_state(chip->pci, 0);
+	pci_set_power_state(chip->pci, PCI_D0);
 	pci_set_master(chip->pci);
 
 	snd_atiixp_aclink_reset(chip);

.