Changeset 445 for GPL/trunk/alsa-kernel/pci

Timestamp:

Jun 8, 2009, 11:51:32 AM (16 years ago)

Author:

Paul Smedley

Message:

More code tidyups, remove some unnecessary #ifndef TARGET_OS2 by adding some more stub functions

Location:

GPL/trunk/alsa-kernel/pci

Files:

• bt87x.c (modified) (1 diff)
• hda/hda_intel.c (modified) (1 diff)
• hda/makefile.os2 (modified) (1 diff)
• intel8x0.c (modified) (1 diff)
• ymfpci/ymfpci_main.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/pci/bt87x.c

@@ -22 +22 @@
  */
 
-#ifdef TARGET_OS2
-#include <asm/bitops.h>
-#endif
 #include <linux/init.h>
 #include <linux/interrupt.h>

GPL/trunk/alsa-kernel/pci/hda/hda_intel.c

@@ -1938 +1938 @@
                 printk(KERN_ERR "hda-intel: unable to grab IRQ %d, "
                        "disabling device\n", chip->pci->irq);
-#ifndef TARGEt_OS2
+#ifndef TARGET_OS2
                 if (do_disconnect)
                         snd_card_disconnect(chip->card);

GPL/trunk/alsa-kernel/pci/hda/makefile.os2

@@ -16 +16 @@
 FILE2    = patch_realtek.obj patch_cmedia.obj patch_analog.obj patch_sigmatel.obj
 FILE3    = patch_si3054.obj patch_atihdmi.obj patch_conexant.obj patch_via.obj
-FILE4    =
+FILE4    = 
 FILE5    =
 FILE6    =

GPL/trunk/alsa-kernel/pci/intel8x0.c

@@ -41 +41 @@
 /* for 440MX workaround */
 #include <asm/pgtable.h>
-#ifndef TARGET_OS2
 #include <asm/cacheflush.h>
-#endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");

GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci_main.c

@@ -85 +85 @@
                 if ((snd_ymfpci_readw(chip, reg) & 0x8000) == 0)
                         return 0;
-#ifndef TARGET_OS2
                 schedule_timeout_uninterruptible(1);
-#else
-                set_current_state(TASK_UNINTERRUPTIBLE); 
-                schedule_timeout(1);
-#endif
         } while (time_before(jiffies, end_time));
         snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_ymfpci_readw(chip, reg));
@@ -794 +789 @@
                 add_wait_queue(&chip->interrupt_sleep, &wait);
                 atomic_inc(&chip->interrupt_sleep_count);
-#ifndef TARGET_OS2
                 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
-#else
-                set_current_state(TASK_UNINTERRUPTIBLE); 
-                schedule_timeout(msecs_to_jiffies(50));
-#endif
-
                 remove_wait_queue(&chip->interrupt_sleep, &wait);
         }