Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1:/tmp/cvs-serv3576/ymfpci
Modified Files:
ymfpci.c ymfpci_main.c
Log Message:
clean up PM codes
Index: ymfpci.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ymfpci.c 16 Jun 2003 07:31:38 -0000 1.23
+++ ymfpci.c 18 Jun 2003 11:07:22 -0000 1.24
@@ -251,7 +251,6 @@
}
#ifdef CONFIG_PM
-#ifndef PCI_OLD_SUSPEND
static int snd_card_ymfpci_suspend(struct pci_dev *pci, u32 state)
{
ymfpci_t *chip = snd_magic_cast(ymfpci_t, pci_get_drvdata(pci), return -ENXIO);
@@ -264,18 +263,6 @@
snd_ymfpci_resume(chip);
return 0;
}
-#else
-static void snd_card_ymfpci_suspend(struct pci_dev *pci)
-{
- ymfpci_t *chip = snd_magic_cast(ymfpci_t, pci_get_drvdata(pci), return);
- snd_ymfpci_suspend(chip);
-}
-static void snd_card_ymfpci_resume(struct pci_dev *pci)
-{
- ymfpci_t *chip = snd_magic_cast(ymfpci_t, pci_get_drvdata(pci), return);
- snd_ymfpci_resume(chip);
-}
-#endif
#endif
static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
Index: ymfpci_main.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci_main.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ymfpci_main.c 16 Jun 2003 07:31:38 -0000 1.37
+++ ymfpci_main.c 18 Jun 2003 11:07:22 -0000 1.38
@@ -84,7 +84,7 @@
writel(val, chip->reg_area_virt + offset);
}
-static int snd_ymfpci_codec_ready(ymfpci_t *chip, int secondary, int sched)
+static int snd_ymfpci_codec_ready(ymfpci_t *chip, int secondary)
{
signed long end_time;
u32 reg = secondary ? YDSXGR_SECSTATUSADR : YDSXGR_PRISTATUSADR;
@@ -93,10 +93,8 @@
do {
if ((snd_ymfpci_readw(chip, reg) & 0x8000) == 0)
return 0;
- if (sched) {
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(1);
- }
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(1);
} while (end_time - (signed long)jiffies >= 0);
snd_printk("codec_ready: codec %i is not ready [0x%x]\n", secondary,
snd_ymfpci_readw(chip, reg));
return -EBUSY;
@@ -107,7 +105,7 @@
ymfpci_t *chip = snd_magic_cast(ymfpci_t, ac97->private_data, return);
u32 cmd;
- snd_ymfpci_codec_ready(chip, 0, 0);
+ snd_ymfpci_codec_ready(chip, 0);
cmd = ((YDSXG_AC97WRITECMD | reg) << 16) | val;
snd_ymfpci_writel(chip, YDSXGR_AC97CMDDATA, cmd);
}
@@ -116,10 +114,10 @@
{
ymfpci_t *chip = snd_magic_cast(ymfpci_t, ac97->private_data, return -ENXIO);
- if (snd_ymfpci_codec_ready(chip, 0, 0))
+ if (snd_ymfpci_codec_ready(chip, 0))
return ~0;
snd_ymfpci_writew(chip, YDSXGR_AC97CMDADR, YDSXG_AC97READCMD | reg);
- if (snd_ymfpci_codec_ready(chip, 0, 0))
+ if (snd_ymfpci_codec_ready(chip, 0))
return ~0;
if (chip->device_id == PCI_DEVICE_ID_YAMAHA_744 && chip->rev < 2) {
int i;
@@ -2209,7 +2207,7 @@
pci_enable_device(chip->pci);
pci_set_master(chip->pci);
snd_ymfpci_aclink_reset(chip->pci);
- snd_ymfpci_codec_ready(chip, 0, 0);
+ snd_ymfpci_codec_ready(chip, 0);
snd_ymfpci_download_image(chip);
udelay(100);
@@ -2299,7 +2297,7 @@
chip->irq = pci->irq;
snd_ymfpci_aclink_reset(pci);
- if (snd_ymfpci_codec_ready(chip, 0, 1) < 0) {
+ if (snd_ymfpci_codec_ready(chip, 0) < 0) {
snd_ymfpci_free(chip);
return -EIO;
}
-------------------------------------------------------
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
