linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / oss / ali5455.c

diff --git a/sound/oss/ali5455.c b/sound/oss/ali5455.c
index 70dcd70..9c9e6c0 100644 (file)
--- a/sound/oss/ali5455.c
+++ b/sound/oss/ali5455.c
@@ -64,8 +64,6 @@
 #include <linux/smp_lock.h>
 #include <linux/ac97_codec.h>
 #include <linux/interrupt.h>
-#include <linux/mutex.h>
-
 #include <asm/uaccess.h>
 
 #ifndef PCI_DEVICE_ID_ALI_5455
@@ -236,7 +234,7 @@ struct ali_state {
        struct ali_card *card;  /* Card info */
 
        /* single open lock mechanism, only used for recording */
-       struct mutex open_mutex;
+       struct semaphore open_sem;
        wait_queue_head_t open_wait;
 
        /* file mode */
@@ -2809,7 +2807,7 @@ found_virt:
        state->card = card;
        state->magic = ALI5455_STATE_MAGIC;
        init_waitqueue_head(&dmabuf->wait);
-       mutex_init(&state->open_mutex);
+       init_MUTEX(&state->open_sem);
        file->private_data = state;
        dmabuf->trigger = 0;
        /* allocate hardware channels */
@@ -3361,7 +3359,7 @@ static void __devinit ali_configure_clocking(void)
                state->card = card;
                state->magic = ALI5455_STATE_MAGIC;
                init_waitqueue_head(&dmabuf->wait);
-               mutex_init(&state->open_mutex);
+               init_MUTEX(&state->open_sem);
                dmabuf->fmt = ALI5455_FMT_STEREO | ALI5455_FMT_16BIT;
                dmabuf->trigger = PCM_ENABLE_OUTPUT;
                ali_set_dac_rate(state, 48000);
@@ -3460,7 +3458,7 @@ static int __devinit ali_probe(struct pci_dev *pci_dev,
        card->channel[4].num = 4;
        /* claim our iospace and irq */
        request_region(card->iobase, 256, card_names[pci_id->driver_data]);
-       if (request_irq(card->irq, &ali_interrupt, IRQF_SHARED,
+       if (request_irq(card->irq, &ali_interrupt, SA_SHIRQ,
                        card_names[pci_id->driver_data], card)) {
                printk(KERN_ERR "ali_audio: unable to allocate irq %d\n",
                       card->irq);