Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 68c7a5f..85c2d4c 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -73,7 +73,7 @@
   - fix all XXX showstoppers
   - disable IR/IT DMA interrupts on shutdown
   - flush pci writes to the card by issuing a read
-  - devfs and character device dispatching (* needs testing with Linux 2.2.x)
+  - character device dispatching
   - switch over to the new kernel DMA API (pci_map_*()) (* needs testing on platforms with IOMMU!)
   - keep all video_cards in a list (for open() via chardev), set file->private_data = video
   - dv1394_poll should indicate POLLIN when receiving buffers are available
@@ -108,7 +108,6 @@
 #include <linux/types.h>
 #include <linux/vmalloc.h>
 #include <linux/string.h>
-#include <linux/ioctl32.h>
 #include <linux/compat.h>
 #include <linux/cdev.h>
 
@@ -123,15 +122,6 @@
 
 #include "ohci1394.h"
 
-#ifndef virt_to_page
-#define virt_to_page(x) MAP_NR(x)
-#endif
-
-#ifndef vmalloc_32
-#define vmalloc_32(x) vmalloc(x)
-#endif
-
-
 /* DEBUG LEVELS:
    0 - no debugging messages
    1 - some debugging messages, but none during DMA frame transmission
@@ -1106,7 +1096,6 @@ static int do_dv1394_init_default(struct video_card *video)
 
        init.api_version = DV1394_API_VERSION;
        init.n_frames = DV1394_MAX_FRAMES / 4;
-       /* the following are now set via devfs */
        init.channel = video->channel;
        init.format = video->pal_or_ntsc;
        init.cip_n = video->cip_n;
@@ -1801,8 +1790,6 @@ static int dv1394_open(struct inode *inode, struct file *file)
 {
        struct video_card *video = NULL;
 
-       /* if the device was opened through devfs, then file->private_data
-          has already been set to video by devfs */
        if (file->private_data) {
                video = (struct video_card*) file->private_data;
 
@@ -2218,14 +2205,12 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes
        unsigned long flags;
        int i;
 
-       video = kmalloc(sizeof(struct video_card), GFP_KERNEL);
+       video = kzalloc(sizeof(*video), GFP_KERNEL);
        if (!video) {
                printk(KERN_ERR "dv1394: cannot allocate video_card\n");
-               goto err;
+               return -1;
        }
 
-       memset(video, 0, sizeof(struct video_card));
-
        video->ohci = ohci;
        /* lower 2 bits of id indicate which of four "plugs"
           per host */
@@ -2278,37 +2263,14 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes
        list_add_tail(&video->list, &dv1394_cards);
        spin_unlock_irqrestore(&dv1394_cards_lock, flags);
 
-       if (devfs_mk_cdev(MKDEV(IEEE1394_MAJOR,
-                               IEEE1394_MINOR_BLOCK_DV1394*16 + video->id),
-                       S_IFCHR|S_IRUGO|S_IWUGO,
-                        "ieee1394/dv/host%d/%s/%s",
-                        (video->id>>2),
-                        (video->pal_or_ntsc == DV1394_NTSC ? "NTSC" : "PAL"),
-                        (video->mode == MODE_RECEIVE ? "in" : "out")) < 0)
-                       goto err_free;
-
        debug_printk("dv1394: dv1394_init() OK on ID %d\n", video->id);
-
        return 0;
-
- err_free:
-       kfree(video);
- err:
-       return -1;
 }
 
 static void dv1394_un_init(struct video_card *video)
 {
-       char buf[32];
-
        /* obviously nobody has the driver open at this point */
        do_dv1394_shutdown(video, 1);
-       snprintf(buf, sizeof(buf), "dv/host%d/%s/%s", (video->id >> 2),
-               (video->pal_or_ntsc == DV1394_NTSC ? "NTSC" : "PAL"),
-               (video->mode == MODE_RECEIVE ? "in" : "out")
-               );
-
-       devfs_remove("ieee1394/%s", buf);
        kfree(video);
 }
 
@@ -2343,11 +2305,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);
+       class_device_destroy(hpsb_protocol_class,
+               MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)));
 }
 
 static void dv1394_add_host (struct hpsb_host *host)
@@ -2361,12 +2320,9 @@ static void dv1394_add_host (struct hpsb_host *host)
 
        ohci = (struct ti_ohci *)host->hostdata;
 
-       class_simple_device_add(hpsb_protocol_class, MKDEV(
+       class_device_create(hpsb_protocol_class, NULL, 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);
 
        dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE);
        dv1394_init(ohci, DV1394_NTSC, MODE_TRANSMIT);
@@ -2623,10 +2579,8 @@ MODULE_LICENSE("GPL");
 static void __exit dv1394_exit_module(void)
 {
        hpsb_unregister_protocol(&dv1394_driver);
-
        hpsb_unregister_highlevel(&dv1394_highlevel);
        cdev_del(&dv1394_cdev);
-       devfs_remove("ieee1394/dv");
 }
 
 static int __init dv1394_init_module(void)
@@ -2642,15 +2596,12 @@ static int __init dv1394_init_module(void)
                return ret;
        }
 
-       devfs_mk_dir("ieee1394/dv");
-
        hpsb_register_highlevel(&dv1394_highlevel);
 
        ret = hpsb_register_protocol(&dv1394_driver);
        if (ret) {
                printk(KERN_ERR "dv1394: failed to register protocol\n");
                hpsb_unregister_highlevel(&dv1394_highlevel);
-               devfs_remove("ieee1394/dv");
                cdev_del(&dv1394_cdev);
                return ret;
        }
@@ -2660,4 +2611,3 @@ static int __init dv1394_init_module(void)
 
 module_init(dv1394_init_module);
 module_exit(dv1394_exit_module);
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16);