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

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / raw1394.c

diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 151a48f41c8f781cb99fb2a619e085c5be1a1300..1dadd5a15ba13e7630619a3fa0b3a75bc145b817 100644 (file)
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -434,7 +434,11 @@ struct compat_raw1394_req {
 
        __u64 sendb;
        __u64 recvb;
-} __attribute__((packed));
+}
+#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
+__attribute__((packed))
+#endif
+;
 
 static const char __user *raw1394_compat_write(const char __user *buf)
 {
@@ -2814,7 +2818,11 @@ struct raw1394_iso_packets32 {
 struct raw1394_cycle_timer32 {
         __u32 cycle_timer;
         __u64 local_time;
-} __attribute__((packed));
+}
+#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
+__attribute__((packed))
+#endif
+;
 
 #define RAW1394_IOC_ISO_RECV_PACKETS32          \
         _IOW ('#', 0x25, struct raw1394_iso_packets32)
@@ -3152,9 +3160,9 @@ static int __init init_raw1394(void)
        hpsb_register_highlevel(&raw1394_highlevel);
 
        if (IS_ERR
-           (class_device_create
-            (hpsb_protocol_class, NULL,
-             MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), NULL,
+           (device_create(
+             hpsb_protocol_class, NULL,
+             MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
              RAW1394_DEVICE_NAME))) {
                ret = -EFAULT;
                goto out_unreg;
@@ -3181,9 +3189,9 @@ static int __init init_raw1394(void)
        goto out;
 
       out_dev:
-       class_device_destroy(hpsb_protocol_class,
-                            MKDEV(IEEE1394_MAJOR,
-                                  IEEE1394_MINOR_BLOCK_RAW1394 * 16));
+       device_destroy(hpsb_protocol_class,
+                      MKDEV(IEEE1394_MAJOR,
+                            IEEE1394_MINOR_BLOCK_RAW1394 * 16));
       out_unreg:
        hpsb_unregister_highlevel(&raw1394_highlevel);
       out:
@@ -3192,9 +3200,9 @@ static int __init init_raw1394(void)
 
 static void __exit cleanup_raw1394(void)
 {
-       class_device_destroy(hpsb_protocol_class,
-                            MKDEV(IEEE1394_MAJOR,
-                                  IEEE1394_MINOR_BLOCK_RAW1394 * 16));
+       device_destroy(hpsb_protocol_class,
+                      MKDEV(IEEE1394_MAJOR,
+                            IEEE1394_MINOR_BLOCK_RAW1394 * 16));
        cdev_del(&raw1394_cdev);
        hpsb_unregister_highlevel(&raw1394_highlevel);
        hpsb_unregister_protocol(&raw1394_driver);