Update of /cvsroot/alsa/alsa-kernel/pci/trident In directory sc8-pr-cvs1:/tmp/cvs-serv3576/trident
Modified Files: trident.c trident_main.c Log Message: clean up PM codes Index: trident.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- trident.c 10 Mar 2003 13:35:36 -0000 1.17 +++ trident.c 18 Jun 2003 11:07:22 -0000 1.18 @@ -182,7 +182,6 @@ } #ifdef CONFIG_PM -#ifndef PCI_OLD_SUSPEND static int snd_card_trident_suspend(struct pci_dev *pci, u32 state) { trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return -ENXIO); @@ -195,18 +194,6 @@ snd_trident_resume(chip); return 0; } -#else -static void snd_card_trident_suspend(struct pci_dev *pci) -{ - trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return); - snd_trident_suspend(chip); -} -static void snd_card_trident_resume(struct pci_dev *pci) -{ - trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return); - snd_trident_resume(chip); -} -#endif #endif static struct pci_driver driver = { Index: trident_main.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- trident_main.c 30 Apr 2003 11:53:25 -0000 1.43 +++ trident_main.c 18 Jun 2003 11:07:22 -0000 1.44 @@ -3173,12 +3173,6 @@ */ inline static void do_delay(trident_t *chip) { -#ifdef CONFIG_PM - if (chip->in_suspend) { - mdelay((1000 + HZ - 1) / HZ); - return; - } -#endif set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(1); } ------------------------------------------------------- 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