upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / drivers / ieee1394 / dv1394.c

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index ecf6830..68c7a5f 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -168,11 +168,16 @@ static inline void flush_pci_write(struct ti_ohci *ohci)
 static void it_tasklet_func(unsigned long data);
 static void ir_tasklet_func(unsigned long data);
 
+#ifdef CONFIG_COMPAT
+static long dv1394_compat_ioctl(struct file *file, unsigned int cmd,
+                              unsigned long arg);
+#endif
+
 /* GLOBAL DATA */
 
 /* list of all video_cards */
 static LIST_HEAD(dv1394_cards);
-static spinlock_t dv1394_cards_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dv1394_cards_lock);
 
 /* translate from a struct file* to the corresponding struct video_card* */
 
@@ -1272,7 +1277,7 @@ static void do_dv1394_shutdown(struct video_card *video, int free_dv_buf)
        error-prone code in dv1394.
 */
 
-int dv1394_mmap(struct file *file, struct vm_area_struct *vma)
+static int dv1394_mmap(struct file *file, struct vm_area_struct *vma)
 {
        struct video_card *video = file_to_video_card(file);
        int retval = -EINVAL;
@@ -1540,26 +1545,29 @@ static ssize_t dv1394_read(struct file *file,  char __user *buffer, size_t count
 
 /*** DEVICE IOCTL INTERFACE ************************************************/
 
-/* I *think* the VFS serializes ioctl() for us, so we don't have to worry
-   about situations like having two threads in here at once... */
-
-static int dv1394_ioctl(struct inode *inode, struct file *file,
-                          unsigned int cmd, unsigned long arg)
+static long dv1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       struct video_card *video = file_to_video_card(file);
+       struct video_card *video;
        unsigned long flags;
        int ret = -EINVAL;
        void __user *argp = (void __user *)arg;
 
        DECLARE_WAITQUEUE(wait, current);
 
+       lock_kernel();
+       video = file_to_video_card(file);
+
        /* serialize this to prevent multi-threaded mayhem */
        if (file->f_flags & O_NONBLOCK) {
-               if (down_trylock(&video->sem))
+               if (down_trylock(&video->sem)) {
+                       unlock_kernel();
                        return -EAGAIN;
+               }
        } else {
-               if (down_interruptible(&video->sem))
+               if (down_interruptible(&video->sem)) {
+                       unlock_kernel();
                        return -ERESTARTSYS;
+               }
        }
 
        switch(cmd)
@@ -1783,11 +1791,10 @@ static int dv1394_ioctl(struct inode *inode, struct file *file,
 
  out:
        up(&video->sem);
+       unlock_kernel();
        return ret;
 }
 
-
-
 /*** DEVICE FILE INTERFACE CONTINUED ***************************************/
 
 static int dv1394_open(struct inode *inode, struct file *file)
@@ -2165,7 +2172,10 @@ static struct file_operations dv1394_fops=
 {
        .owner =        THIS_MODULE,
        .poll =         dv1394_poll,
-       .ioctl =        dv1394_ioctl,
+       .unlocked_ioctl = dv1394_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl = dv1394_compat_ioctl,
+#endif
        .mmap =         dv1394_mmap,
        .open =         dv1394_open,
        .write =        dv1394_write,
@@ -2333,6 +2343,8 @@ static void dv1394_remove_host (struct hpsb_host *host)
                        dv1394_un_init(video);
        } while (video != NULL);
 
+       class_simple_device_remove(MKDEV(
+               IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)));
        devfs_remove("ieee1394/dv/host%d/NTSC", id);
        devfs_remove("ieee1394/dv/host%d/PAL", id);
        devfs_remove("ieee1394/dv/host%d", id);
@@ -2349,6 +2361,9 @@ static void dv1394_add_host (struct hpsb_host *host)
 
        ohci = (struct ti_ohci *)host->hostdata;
 
+       class_simple_device_add(hpsb_protocol_class, MKDEV(
+               IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), 
+               NULL, "dv1394-%d", id);
        devfs_mk_dir("ieee1394/dv/host%d", id);
        devfs_mk_dir("ieee1394/dv/host%d/NTSC", id);
        devfs_mk_dir("ieee1394/dv/host%d/PAL", id);
@@ -2507,15 +2522,16 @@ struct dv1394_status32 {
        u32 dropped_frames;
 };
 
-static int handle_dv1394_init(unsigned int fd, unsigned int cmd, unsigned long arg,
-                             struct file *file)
+/* RED-PEN: this should use compat_alloc_userspace instead */
+
+static int handle_dv1394_init(struct file *file, unsigned int cmd, unsigned long arg)
 {
        struct dv1394_init32 dv32;
        struct dv1394_init dv;
        mm_segment_t old_fs;
        int ret;
 
-       if (file->f_op->ioctl != dv1394_ioctl)
+       if (file->f_op->unlocked_ioctl != dv1394_ioctl)
                return -EFAULT;
 
        if (copy_from_user(&dv32, (void __user *)arg, sizeof(dv32)))
@@ -2531,28 +2547,25 @@ static int handle_dv1394_init(unsigned int fd, unsigned int cmd, unsigned long a
 
        old_fs = get_fs();
        set_fs(KERNEL_DS);
-       ret = dv1394_ioctl(file->f_dentry->d_inode, file,
-                          DV1394_IOC_INIT, (unsigned long)&dv);
+       ret = dv1394_ioctl(file, DV1394_IOC_INIT, (unsigned long)&dv);
        set_fs(old_fs);
 
        return ret;
 }
 
-static int handle_dv1394_get_status(unsigned int fd, unsigned int cmd, unsigned long arg,
-                                   struct file *file)
+static int handle_dv1394_get_status(struct file *file, unsigned int cmd, unsigned long arg)
 {
        struct dv1394_status32 dv32;
        struct dv1394_status dv;
        mm_segment_t old_fs;
        int ret;
 
-       if (file->f_op->ioctl != dv1394_ioctl)
+       if (file->f_op->unlocked_ioctl != dv1394_ioctl)
                return -EFAULT;
 
        old_fs = get_fs();
        set_fs(KERNEL_DS);
-       ret = dv1394_ioctl(file->f_dentry->d_inode, file,
-                          DV1394_IOC_GET_STATUS, (unsigned long)&dv);
+       ret = dv1394_ioctl(file, DV1394_IOC_GET_STATUS, (unsigned long)&dv);
        set_fs(old_fs);
 
        if (!ret) {
@@ -2574,6 +2587,29 @@ static int handle_dv1394_get_status(unsigned int fd, unsigned int cmd, unsigned
 
        return ret;
 }
+
+
+
+static long dv1394_compat_ioctl(struct file *file, unsigned int cmd,
+                              unsigned long arg)
+{
+       switch (cmd) {
+       case DV1394_IOC_SHUTDOWN:
+       case DV1394_IOC_SUBMIT_FRAMES:
+       case DV1394_IOC_WAIT_FRAMES:
+       case DV1394_IOC_RECEIVE_FRAMES:
+       case DV1394_IOC_START_RECEIVE:
+               return dv1394_ioctl(file, cmd, arg);
+
+       case DV1394_IOC32_INIT:
+               return handle_dv1394_init(file, cmd, arg);
+       case DV1394_IOC32_GET_STATUS:
+               return handle_dv1394_get_status(file, cmd, arg);
+       default:
+               return -ENOIOCTLCMD;
+       }
+}
+
 #endif /* CONFIG_COMPAT */
 
 
@@ -2586,20 +2622,6 @@ MODULE_LICENSE("GPL");
 
 static void __exit dv1394_exit_module(void)
 {
-#ifdef CONFIG_COMPAT
-       int ret;
-
-       ret = unregister_ioctl32_conversion(DV1394_IOC_SHUTDOWN);
-       ret |= unregister_ioctl32_conversion(DV1394_IOC_SUBMIT_FRAMES);
-       ret |= unregister_ioctl32_conversion(DV1394_IOC_WAIT_FRAMES);
-       ret |= unregister_ioctl32_conversion(DV1394_IOC_RECEIVE_FRAMES);
-       ret |= unregister_ioctl32_conversion(DV1394_IOC_START_RECEIVE);
-       ret |= unregister_ioctl32_conversion(DV1394_IOC32_INIT);
-       ret |= unregister_ioctl32_conversion(DV1394_IOC32_GET_STATUS);
-       if (ret)
-               printk(KERN_ERR "dv1394: Error unregistering ioctl32 translations\n");
-#endif
-
        hpsb_unregister_protocol(&dv1394_driver);
 
        hpsb_unregister_highlevel(&dv1394_highlevel);
@@ -2633,23 +2655,6 @@ static int __init dv1394_init_module(void)
                return ret;
        }
 
-#ifdef CONFIG_COMPAT
-       {
-               /* First compatible ones */
-               ret = register_ioctl32_conversion(DV1394_IOC_SHUTDOWN, NULL);
-               ret |= register_ioctl32_conversion(DV1394_IOC_SUBMIT_FRAMES, NULL);
-               ret |= register_ioctl32_conversion(DV1394_IOC_WAIT_FRAMES, NULL);
-               ret |= register_ioctl32_conversion(DV1394_IOC_RECEIVE_FRAMES, NULL);
-               ret |= register_ioctl32_conversion(DV1394_IOC_START_RECEIVE, NULL);
-
-               /* These need to be handled by translation */
-               ret |= register_ioctl32_conversion(DV1394_IOC32_INIT, handle_dv1394_init);
-               ret |= register_ioctl32_conversion(DV1394_IOC32_GET_STATUS, handle_dv1394_get_status);
-               if (ret)
-                       printk(KERN_ERR "dv1394: Error registering ioctl32 translations\n");
-       }
-#endif
-
        return 0;
 }