Update of /cvsroot/alsa/alsa-driver/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv4448
Modified Files:
.cvsignore Makefile
Added Files:
cs4281.patch es1968.patch intel8x0.patch maestro3.patch
Removed Files:
cs4281.c es1968.c intel8x0.c maestro3.c
Log Message:
clean up PM codes; moved the old part to patch
--- NEW FILE: cs4281.patch ---
--- cs4281.c 2003-06-10 15:21:01.000000000 +0200
+++ cs4281.c.old 2003-06-10 15:20:49.000000000 +0200
@@ -2119,6 +2119,7 @@
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
}
+#ifndef PCI_OLD_SUSPEND
static int snd_cs4281_suspend(struct pci_dev *dev, u32 state)
{
cs4281_t *chip = snd_magic_cast(cs4281_t, pci_get_drvdata(dev), return -ENXIO);
@@ -2131,6 +2132,18 @@
cs4281_resume(chip);
return 0;
}
+#else
+static void snd_cs4281_suspend(struct pci_dev *dev)
+{
+ cs4281_t *chip = snd_magic_cast(cs4281_t, pci_get_drvdata(dev), return);
+ cs4281_suspend(chip);
+}
+static void snd_cs4281_resume(struct pci_dev *dev)
+{
+ cs4281_t *chip = snd_magic_cast(cs4281_t, pci_get_drvdata(dev), return);
+ cs4281_resume(chip);
+}
+#endif
/* callback */
static int snd_cs4281_set_power_state(snd_card_t *card, unsigned int power_state)
@@ -2206,3 +2219,4 @@
__setup("snd-cs4281=", alsa_card_cs4281_setup);
#endif /* ifndef MODULE */
+EXPORT_NO_SYMBOLS;
--- NEW FILE: es1968.patch ---
--- es1968.c 2003-06-10 15:20:37.000000000 +0200
+++ es1968.c.old 2003-06-10 15:20:22.000000000 +0200
@@ -2468,6 +2468,7 @@
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
}
+#ifndef PCI_OLD_SUSPEND
static int snd_es1968_suspend(struct pci_dev *dev, u32 state)
{
es1968_t *chip = snd_magic_cast(es1968_t, pci_get_drvdata(dev), return -ENXIO);
@@ -2480,6 +2481,18 @@
es1968_resume(chip);
return 0;
}
+#else
+static void snd_es1968_suspend(struct pci_dev *dev)
+{
+ es1968_t *chip = snd_magic_cast(es1968_t, pci_get_drvdata(dev), return);
+ es1968_suspend(chip);
+}
+static void snd_es1968_resume(struct pci_dev *dev)
+{
+ es1968_t *chip = snd_magic_cast(es1968_t, pci_get_drvdata(dev), return);
+ es1968_resume(chip);
+}
+#endif
/* callback */
static int snd_es1968_set_power_state(snd_card_t *card, unsigned int power_state)
@@ -2868,3 +2881,4 @@
__setup("snd-es1968=", alsa_card_es1968_setup);
#endif /* ifndef MODULE */
+EXPORT_NO_SYMBOLS;
--- NEW FILE: intel8x0.patch ---
--- intel8x0.c 2003-06-10 15:08:31.000000000 +0200
+++ intel8x0.c.old 2003-06-10 15:10:32.000000000 +0200
@@ -1942,6 +1942,7 @@
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
}
+#ifndef PCI_OLD_SUSPEND
static int snd_intel8x0_suspend(struct pci_dev *dev, u32 state)
{
intel8x0_t *chip = snd_magic_cast(intel8x0_t, pci_get_drvdata(dev), return
-ENXIO);
@@ -1954,6 +1955,18 @@
intel8x0_resume(chip);
return 0;
}
+#else
+static void snd_intel8x0_suspend(struct pci_dev *dev)
+{
+ intel8x0_t *chip = snd_magic_cast(intel8x0_t, pci_get_drvdata(dev), return);
+ intel8x0_suspend(chip);
+}
+static void snd_intel8x0_resume(struct pci_dev *dev)
+{
+ intel8x0_t *chip = snd_magic_cast(intel8x0_t, pci_get_drvdata(dev), return);
+ intel8x0_resume(chip);
+}
+#endif
/* callback */
static int snd_intel8x0_set_power_state(snd_card_t *card, unsigned int power_state)
@@ -2539,3 +2552,4 @@
__setup("snd-intel8x0=", alsa_card_intel8x0_setup);
#endif /* ifndef MODULE */
+EXPORT_NO_SYMBOLS;
--- NEW FILE: maestro3.patch ---
--- maestro3.c 2003-06-10 15:23:49.000000000 +0200
+++ maestro3.c.old 2003-06-10 15:23:56.000000000 +0200
@@ -2458,6 +2458,7 @@
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
}
+#ifndef PCI_OLD_SUSPEND
static int snd_m3_suspend(struct pci_dev *pci, u32 state)
{
m3_t *chip = snd_magic_cast(m3_t, pci_get_drvdata(pci), return -ENXIO);
@@ -2470,6 +2471,18 @@
m3_resume(chip);
return 0;
}
+#else
+static void snd_m3_suspend(struct pci_dev *pci)
+{
+ m3_t *chip = snd_magic_cast(m3_t, pci_get_drvdata(pci), return);
+ m3_suspend(chip);
+}
+static void snd_m3_resume(struct pci_dev *pci)
+{
+ m3_t *chip = snd_magic_cast(m3_t, pci_get_drvdata(pci), return);
+ m3_resume(chip);
+}
+#endif
/* callback */
static int snd_m3_set_power_state(snd_card_t *card, unsigned int power_state)
@@ -2769,3 +2782,4 @@
__setup("snd-maestro3=", alsa_card_maestro3_setup);
#endif /* ifndef MODULE */
+EXPORT_NO_SYMBOLS;
Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Dec 2001 20:46:15 -0000 1.1
+++ .cvsignore 18 Jun 2003 11:12:52 -0000 1.2
@@ -1 +1,5 @@
.depend
+cs4281.c
+es1968.c
+intel8x0.c
+maestro3.c
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 2 Jun 2003 13:03:40 -0000 1.7
+++ Makefile 18 Jun 2003 11:12:52 -0000 1.8
@@ -7,6 +7,8 @@
# ALSA extra code
#
+EXTRA_CLEAN = cs4281.c es1968.c intel8x0.c maestro3.c
+
extra-subdir-y := pdplus
extra-subdir-m := $(extra-subdir-y)
@@ -18,3 +20,9 @@
include $(TOPDIR)/alsa-kernel/pci/Makefile
include $(TOPDIR)/Rules.make
+
+cs4281.c: cs4281.patch $(TOPDIR)/alsa-kernel/pci/cs4281.c
+es1968.c: es1968.patch $(TOPDIR)/alsa-kernel/pci/es1968.c
+intel8x0.c: intel8x0.patch $(TOPDIR)/alsa-kernel/pci/intel8x0.c
+maestro3.c: maestro3.patch $(TOPDIR)/alsa-kernel/pci/maestro3.c
+
--- cs4281.c DELETED ---
--- es1968.c DELETED ---
--- intel8x0.c DELETED ---
--- maestro3.c DELETED ---
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
