Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/sound/oss/ali5455.c b/sound/oss/ali5455.c
index a331e87..62bb936 100644 (file)
--- a/sound/oss/ali5455.c
+++ b/sound/oss/ali5455.c
@@ -64,6 +64,8 @@
 #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
@@ -234,7 +236,7 @@ struct ali_state {
        struct ali_card *card;  /* Card info */
 
        /* single open lock mechanism, only used for recording */
-       struct semaphore open_sem;
+       struct mutex open_mutex;
        wait_queue_head_t open_wait;
 
        /* file mode */
@@ -2807,7 +2809,7 @@ found_virt:
        state->card = card;
        state->magic = ALI5455_STATE_MAGIC;
        init_waitqueue_head(&dmabuf->wait);
-       init_MUTEX(&state->open_sem);
+       mutex_init(&state->open_mutex);
        file->private_data = state;
        dmabuf->trigger = 0;
        /* allocate hardware channels */
@@ -3359,7 +3361,7 @@ static void __devinit ali_configure_clocking(void)
                state->card = card;
                state->magic = ALI5455_STATE_MAGIC;
                init_waitqueue_head(&dmabuf->wait);
-               init_MUTEX(&state->open_sem);
+               mutex_init(&state->open_mutex);
                dmabuf->fmt = ALI5455_FMT_STEREO | ALI5455_FMT_16BIT;
                dmabuf->trigger = PCM_ENABLE_OUTPUT;
                ali_set_dac_rate(state, 48000);
@@ -3528,7 +3530,7 @@ static void __devexit ali_remove(struct pci_dev *pci_dev)
 }
 
 #ifdef CONFIG_PM
-static int ali_pm_suspend(struct pci_dev *dev, u32 pm_state)
+static int ali_pm_suspend(struct pci_dev *dev, pm_message_t pm_state)
 {
        struct ali_card *card = pci_get_drvdata(dev);
        struct ali_state *state;
@@ -3651,12 +3653,13 @@ static int ali_pm_resume(struct pci_dev *dev)
 MODULE_AUTHOR("");
 MODULE_DESCRIPTION("ALI 5455 audio support");
 MODULE_LICENSE("GPL");
-MODULE_PARM(clocking, "i");
-MODULE_PARM(strict_clocking, "i");
-MODULE_PARM(codec_pcmout_share_spdif_locked, "i");
-MODULE_PARM(codec_independent_spdif_locked, "i");
-MODULE_PARM(controller_pcmout_share_spdif_locked, "i");
-MODULE_PARM(controller_independent_spdif_locked, "i");
+module_param(clocking, int, 0);
+/* FIXME: bool? */
+module_param(strict_clocking, uint, 0);
+module_param(codec_pcmout_share_spdif_locked, uint, 0);
+module_param(codec_independent_spdif_locked, uint, 0);
+module_param(controller_pcmout_share_spdif_locked, uint, 0);
+module_param(controller_independent_spdif_locked, uint, 0);
 #define ALI5455_MODULE_NAME "ali5455"
 static struct pci_driver ali_pci_driver = {
        .name           = ALI5455_MODULE_NAME,