Changeset 126

Timestamp:

Jun 11, 2007, 2:33:35 AM (18 years ago)

Author:

Brendan Oakley

Message:

Update file_operations struct for compatibility with newer Linux, fix TARGET_OS2 code to work with it.

Location:

GPL/trunk

Files:

• alsa-kernel/core/control.c (modified) (1 diff)
• alsa-kernel/core/info.c (modified) (1 diff)
• alsa-kernel/core/seq/seq_clientmgr.c (modified) (1 diff)
• alsa-kernel/core/sound.c (modified) (1 diff)
• include/linux/fs.h (modified) (1 diff)

GPL/trunk/alsa-kernel/core/control.c

@@ -1293 +1293 @@
 {
 #ifdef LINUX_2_3
-    THIS_MODULE,
+ .owner=   THIS_MODULE,
 #endif
-    0,
-    snd_ctl_read,
-    0,0,
-    snd_ctl_poll,
-    snd_ctl_ioctl,
-    0,
-    snd_ctl_open,0,
-    snd_ctl_release,
-    0,
-    snd_ctl_fasync,
-    0,0,0
+        .read=          snd_ctl_read,
+        .poll=          snd_ctl_poll,
+        .ioctl=         snd_ctl_ioctl,
+        .open=          snd_ctl_open,
+        .release=       snd_ctl_release,
+        .fasync=        snd_ctl_fasync,
 };
 

GPL/trunk/alsa-kernel/core/info.c

@@ -505 +505 @@
 {
 #ifdef LINUX_2_3
-    THIS_MODULE,
-#endif
-    snd_info_entry_llseek,
-    snd_info_entry_read,
-    snd_info_entry_write,
-    0,
-    snd_info_entry_poll,
-    snd_info_entry_ioctl,
-    snd_info_entry_mmap,
-    0,
-    //  snd_info_entry_open,
-    0,
-    snd_info_entry_release,
-    0,0,0,0,0
+.owner=         THIS_MODULE,
+#endif
+        .llseek=        snd_info_entry_llseek,
+        .read=          snd_info_entry_read,
+        .write=         snd_info_entry_write,
+        .poll=          snd_info_entry_poll,
+        .ioctl=         snd_info_entry_ioctl,
+        .mmap=          snd_info_entry_mmap,
+//      .open=          snd_info_entry_open,
+        .release=       snd_info_entry_release,
 };
 #else

GPL/trunk/alsa-kernel/core/seq/seq_clientmgr.c

@@ -2519 +2519 @@
         .release =      snd_seq_release,
         .poll =         snd_seq_poll,
-        .ioctl =        snd_seq_ioctl,
-#ifndef TARGET_OS2
-        .compat_ioctl = snd_seq_ioctl_compat,
-#endif
+        .unlocked_ioctl =       snd_seq_ioctl,
+        .compat_ioctl = snd_seq_ioctl_compat,
 };
 

GPL/trunk/alsa-kernel/core/sound.c

@@ -165 +165 @@
 struct file_operations snd_fops =
 {
-    0,0,0,0,0,0,0,
-    snd_open,0,0,0,0,0,0,0
+        .open=  snd_open
 };
 #else

GPL/trunk/include/linux/fs.h

@@ -235 +235 @@
         unsigned int (*poll) (struct file *, struct poll_table_struct *);
         int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long);
+        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
+        long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
         int (*mmap) (struct file *, struct vm_area_struct *);
         int (*open) (struct inode *, struct file *);