pcmcia: (re)move {pcmcia,pccard}_get_status

[safe/jmp/linux-2.6] / drivers / ieee1394 / dv1394.c

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index d636cfa..9d19aec 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -94,7 +94,6 @@
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 #include <linux/bitops.h>
 #include <asm/byteorder.h>
@@ -2147,7 +2146,7 @@ out:
 }
 
 static struct cdev dv1394_cdev;
-static struct file_operations dv1394_fops=
+static const struct file_operations dv1394_fops=
 {
        .owner =        THIS_MODULE,
        .poll =         dv1394_poll,
@@ -2168,6 +2167,7 @@ static struct file_operations dv1394_fops=
 /*
  * Export information about protocols/devices supported by this driver.
  */
+#ifdef MODULE
 static struct ieee1394_device_id dv1394_id_table[] = {
        {
                .match_flags    = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
@@ -2178,10 +2178,10 @@ static struct ieee1394_device_id dv1394_id_table[] = {
 };
 
 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
+#endif /* MODULE */
 
 static struct hpsb_protocol_driver dv1394_driver = {
-       .name           = "dv1394",
-       .id_table       = dv1394_id_table,
+       .name = "dv1394",
 };
 
 
@@ -2255,47 +2255,37 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes
        return 0;
 }
 
-static void dv1394_un_init(struct video_card *video)
+static void dv1394_remove_host(struct hpsb_host *host)
 {
-       /* obviously nobody has the driver open at this point */
-       do_dv1394_shutdown(video, 1);
-       kfree(video);
-}
-
-
-static void dv1394_remove_host (struct hpsb_host *host)
-{
-       struct video_card *video;
+       struct video_card *video, *tmp_video;
        unsigned long flags;
-       int id = host->id, found_ohci_card = 0;
+       int found_ohci_card = 0;
 
-       /* find the corresponding video_cards */
        do {
-               struct video_card *tmp_vid;
-
                video = NULL;
-
                spin_lock_irqsave(&dv1394_cards_lock, flags);
-               list_for_each_entry(tmp_vid, &dv1394_cards, list) {
-                       if ((tmp_vid->id >> 2) == id) {
-                               list_del(&tmp_vid->list);
-                               video = tmp_vid;
+               list_for_each_entry(tmp_video, &dv1394_cards, list) {
+                       if ((tmp_video->id >> 2) == host->id) {
+                               list_del(&tmp_video->list);
+                               video = tmp_video;
                                found_ohci_card = 1;
                                break;
                        }
                }
                spin_unlock_irqrestore(&dv1394_cards_lock, flags);
 
-               if (video)
-                       dv1394_un_init(video);
-       } while (video != NULL);
+               if (video) {
+                       do_dv1394_shutdown(video, 1);
+                       kfree(video);
+               }
+       } while (video);
 
        if (found_ohci_card)
-               class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
+               device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
                           IEEE1394_MINOR_BLOCK_DV1394 * 16 + (host->id << 2)));
 }
 
-static void dv1394_add_host (struct hpsb_host *host)
+static void dv1394_add_host(struct hpsb_host *host)
 {
        struct ti_ohci *ohci;
        int id = host->id;
@@ -2306,9 +2296,9 @@ static void dv1394_add_host (struct hpsb_host *host)
 
        ohci = (struct ti_ohci *)host->hostdata;
 
-       class_device_create(hpsb_protocol_class, NULL, MKDEV(
-               IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), 
-               NULL, "dv1394-%d", id);
+       device_create(hpsb_protocol_class, NULL, MKDEV(
+               IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)),
+               "dv1394-%d", id);
 
        dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE);
        dv1394_init(ohci, DV1394_NTSC, MODE_TRANSMIT);
@@ -2574,12 +2564,11 @@ static int __init dv1394_init_module(void)
        int ret;
 
        printk(KERN_WARNING
-              "WARNING: The dv1394 driver is unsupported and will be removed "
-              "from Linux soon. Use raw1394 instead.\n");
+              "NOTE: The dv1394 driver is unsupported and may be removed in a "
+              "future Linux release. Use raw1394 instead.\n");
 
        cdev_init(&dv1394_cdev, &dv1394_fops);
        dv1394_cdev.owner = THIS_MODULE;
-       kobject_set_name(&dv1394_cdev.kobj, "dv1394");
        ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
        if (ret) {
                printk(KERN_ERR "dv1394: unable to register character device\n");