ieee1394: convert ieee1394 from "struct class_device" to "struct device"

Here is a straightforward conversion to "struct device". The "struct
class_device" will be removed from the kernel.

It seems to work fine for me with and without CONFIG_SYSFS_DEPRECATED
set.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 87ebd0846c34..bd28adfd7afc 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1340,9 +1340,9 @@ static void video1394_add_host (struct hpsb_host *host)
         hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id);
 
         minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id;
-        class_device_create(hpsb_protocol_class, NULL, MKDEV(
-                IEEE1394_MAJOR, minor), 
-                NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
+        device_create(hpsb_protocol_class, NULL,
+                      MKDEV(IEEE1394_MAJOR, minor),
+                      "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
 }
 
 
@@ -1351,8 +1351,8 @@ static void video1394_remove_host (struct hpsb_host *host)
         struct ti_ohci *ohci = hpsb_get_hostinfo(&video1394_highlevel, host);
 
         if (ohci)
-                class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
-                        IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id));
+                device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
+                               IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id));
         return;
 }