Changeset 499 for GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/cs4281.c

Timestamp:

Jul 5, 2010, 11:51:20 AM (15 years ago)

Author:

Paul Smedley

Message:

Update Uniaud32-2.1.x branch with necessary changes for ALSA 1.0.23

File:

• GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/cs4281.c (modified) (2 diffs)

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/cs4281.c

@@ -495 +495 @@
 static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
 
-static struct pci_device_id snd_cs4281_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cs4281_ids) = {
         { PCI_VDEVICE(CIRRUS, 0x6005), 0, },    /* CS4281 */
         { 0, }
@@ -1140 +1140 @@
 }
 
-static long snd_cs4281_BA0_read(struct snd_info_entry *entry,
-                                void *file_private_data,
-                                struct file *file, char __user *buf,
-                                unsigned long count, unsigned long pos)
-{
-        long size;
+static ssize_t snd_cs4281_BA0_read(struct snd_info_entry *entry,
+                                   void *file_private_data,
+                                   struct file *file, char __user *buf,
+                                   size_t count, loff_t pos)
+{
         struct cs4281 *chip = entry->private_data;
         
-        size = count;
-        if (pos + size > CS4281_BA0_SIZE)
-                size = (long)CS4281_BA0_SIZE - pos;
-        if (size > 0) {
-                if (copy_to_user_fromio(buf, chip->ba0 + pos, size))
-                        return -EFAULT;
-        }
-        return size;
-}
-
-static long snd_cs4281_BA1_read(struct snd_info_entry *entry,
-                                void *file_private_data,
-                                struct file *file, char __user *buf,
-                                unsigned long count, unsigned long pos)
-{
-        long size;
+        if (copy_to_user_fromio(buf, chip->ba0 + pos, count))
+                return -EFAULT;
+        return count;
+}
+
+static ssize_t snd_cs4281_BA1_read(struct snd_info_entry *entry,
+                                   void *file_private_data,
+                                   struct file *file, char __user *buf,
+                                   size_t count, loff_t pos)
+{
         struct cs4281 *chip = entry->private_data;
         
-        size = count;
-        if (pos + size > CS4281_BA1_SIZE)
-                size = (long)CS4281_BA1_SIZE - pos;
-        if (size > 0) {
-                if (copy_to_user_fromio(buf, chip->ba1 + pos, size))
-                        return -EFAULT;
-        }
-        return size;
+        if (copy_to_user_fromio(buf, chip->ba1 + pos, count))
+                return -EFAULT;
+        return count;
 }