This commit was manufactured by cvs2svn to create branch 'vserver'.

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

diff --git a/sound/oss/ali5455.c b/sound/oss/ali5455.c
index 3f3a456..a48be23 100644 (file)
--- a/sound/oss/ali5455.c
+++ b/sound/oss/ali5455.c
@@ -65,7 +65,6 @@
 #include <linux/ac97_codec.h>
 #include <linux/interrupt.h>
 #include <asm/uaccess.h>
-#include <asm/hardirq.h>
 
 #ifndef PCI_DEVICE_ID_ALI_5455
 #define PCI_DEVICE_ID_ALI_5455 0x5455
@@ -312,7 +311,6 @@ struct ali_card {
        u16 pci_id;
 #ifdef CONFIG_PM
        u16 pm_suspended;
-       u32 pm_save_state[64 / sizeof(u32)];
        int pm_saved_mixer_settings[SOUND_MIXER_NRDEVICES][NR_AC97];
 #endif
        /* soundcore stuff */
@@ -935,7 +933,7 @@ static int alloc_dmabuf(struct ali_state *state)
        dmabuf->rawbuf = rawbuf;
        dmabuf->buforder = order;
 
-       /* now mark the pages as reserved; otherwise remap_page_range doesn't do what we want */
+       /* now mark the pages as reserved; otherwise remap_pfn_range doesn't do what we want */
        pend = virt_to_page(rawbuf + (PAGE_SIZE << order) - 1);
        for (page = virt_to_page(rawbuf); page <= pend; page++)
                SetPageReserved(page);
@@ -1583,7 +1581,7 @@ static ssize_t ali_read(struct file *file, char __user *buffer,
                        size_t count, loff_t * ppos)
 {
        struct ali_state *state = (struct ali_state *) file->private_data;
-       struct ali_card *card = state ? state->card : 0;
+       struct ali_card *card = state ? state->card : NULL;
        struct dmabuf *dmabuf = &state->dmabuf;
        ssize_t ret;
        unsigned long flags;
@@ -1593,8 +1591,6 @@ static ssize_t ali_read(struct file *file, char __user *buffer,
 #ifdef DEBUG2
        printk("ali_audio: ali_read called, count = %d\n", count);
 #endif
-       if (ppos != &file->f_pos)
-               return -ESPIPE;
        if (dmabuf->mapped)
                return -ENXIO;
        if (dmabuf->enable & DAC_RUNNING)
@@ -1724,7 +1720,7 @@ static ssize_t ali_write(struct file *file,
                         const char __user *buffer, size_t count, loff_t * ppos)
 {
        struct ali_state *state = (struct ali_state *) file->private_data;
-       struct ali_card *card = state ? state->card : 0;
+       struct ali_card *card = state ? state->card : NULL;
        struct dmabuf *dmabuf = &state->dmabuf;
        ssize_t ret;
        unsigned long flags;
@@ -1734,8 +1730,6 @@ static ssize_t ali_write(struct file *file,
 #ifdef DEBUG2
        printk("ali_audio: ali_write called, count = %d\n", count);
 #endif
-       if (ppos != &file->f_pos)
-               return -ESPIPE;
        if (dmabuf->mapped)
                return -ENXIO;
        if (dmabuf->enable & ADC_RUNNING)
@@ -1960,7 +1954,9 @@ static int ali_mmap(struct file *file, struct vm_area_struct *vma)
        if (size > (PAGE_SIZE << dmabuf->buforder))
                goto out;
        ret = -EAGAIN;
-       if (remap_page_range(vma, vma->vm_start, virt_to_phys(dmabuf->rawbuf), size, vma->vm_page_prot))
+       if (remap_pfn_range(vma, vma->vm_start,
+                               virt_to_phys(dmabuf->rawbuf) >> PAGE_SHIFT,
+                               size, vma->vm_page_prot))
                goto out;
        dmabuf->mapped = 1;
        dmabuf->trigger = 0;
@@ -2890,7 +2886,7 @@ found_virt:
        state->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
        outl(0x00000000, card->iobase + ALI_INTERRUPTCR);
        outl(0x00000000, card->iobase + ALI_INTERRUPTSR);
-       return 0;
+       return nonseekable_open(inode, file);
 }
 
 static int ali_release(struct inode *inode, struct file *file)
@@ -3047,7 +3043,7 @@ static int ali_open_mixdev(struct inode *inode, struct file *file)
                        if (card->ac97_codec[i] != NULL
                            && card->ac97_codec[i]->dev_mixer == minor) {
                                file->private_data = card->ac97_codec[i];
-                               return 0;
+                               return nonseekable_open(inode, file);
                        }
        }
        return -ENODEV;
@@ -3581,7 +3577,7 @@ static int ali_pm_suspend(struct pci_dev *dev, u32 pm_state)
                        }
                }
        }
-       pci_save_state(dev, card->pm_save_state);       /* XXX do we need this? */
+       pci_save_state(dev);    /* XXX do we need this? */
        pci_disable_device(dev);        /* disable busmastering */
        pci_set_power_state(dev, 3);    /* Zzz. */
        return 0;
@@ -3593,7 +3589,7 @@ static int ali_pm_resume(struct pci_dev *dev)
        int num_ac97, i = 0;
        struct ali_card *card = pci_get_drvdata(dev);
        pci_enable_device(dev);
-       pci_restore_state(dev, card->pm_save_state);
+       pci_restore_state(dev);
        /* observation of a toshiba portege 3440ct suggests that the 
           hardware has to be more or less completely reinitialized from
           scratch after an apm suspend.  Works For Me.   -dan */
@@ -3655,12 +3651,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,
@@ -3719,11 +3716,7 @@ static int __init ali_init_module(void)
                        controller_pcmout_share_spdif_locked = 0;
                }
        }
-       if (!pci_register_driver(&ali_pci_driver)) {
-               pci_unregister_driver(&ali_pci_driver);
-               return -ENODEV;
-       }
-       return 0;
+       return pci_register_driver(&ali_pci_driver);
 }
 
 static void __exit ali_cleanup_module(void)