From foo@baz Tue Apr 9 12:12:43 2002 To: Greg KH Date: 23 Mar 2005 09:53:36 -08:00 From: gregkh@suse.de Subject: class: convert drivers/ieee1394/* to use the new class api instead of class_simple Signed-off-by: Greg Kroah-Hartman Index: linux-2.6.12-rc2/drivers/ieee1394/dv1394.c =================================================================== --- linux-2.6.12-rc2.orig/drivers/ieee1394/dv1394.c 2005-04-05 00:11:58.000000000 -0700 +++ linux-2.6.12-rc2/drivers/ieee1394/dv1394.c 2005-04-05 14:05:44.000000000 -0700 @@ -2343,8 +2343,8 @@ dv1394_un_init(video); } while (video != NULL); - class_simple_device_remove(MKDEV( - IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2))); + class_device_destroy(hpsb_protocol_class, + 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); @@ -2361,7 +2361,7 @@ ohci = (struct ti_ohci *)host->hostdata; - class_simple_device_add(hpsb_protocol_class, MKDEV( + class_device_create(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); Index: linux-2.6.12-rc2/drivers/ieee1394/ieee1394_core.c =================================================================== --- linux-2.6.12-rc2.orig/drivers/ieee1394/ieee1394_core.c 2005-03-21 22:44:54.000000000 -0800 +++ linux-2.6.12-rc2/drivers/ieee1394/ieee1394_core.c 2005-04-05 14:05:44.000000000 -0700 @@ -67,7 +67,7 @@ /* Some globals used */ const char *hpsb_speedto_str[] = { "S100", "S200", "S400", "S800", "S1600", "S3200" }; -struct class_simple *hpsb_protocol_class; +struct class *hpsb_protocol_class; #ifdef CONFIG_IEEE1394_VERBOSEDEBUG static void dump_packet(const char *text, quadlet_t *data, int size) @@ -1121,7 +1121,7 @@ if (ret < 0) goto release_all_bus; - hpsb_protocol_class = class_simple_create(THIS_MODULE, "ieee1394_protocol"); + hpsb_protocol_class = class_create(THIS_MODULE, "ieee1394_protocol"); if (IS_ERR(hpsb_protocol_class)) { ret = PTR_ERR(hpsb_protocol_class); goto release_class_host; @@ -1159,7 +1159,7 @@ cleanup_csr: cleanup_csr(); release_class_protocol: - class_simple_destroy(hpsb_protocol_class); + class_destroy(hpsb_protocol_class); release_class_host: class_unregister(&hpsb_host_class); release_all_bus: @@ -1189,7 +1189,7 @@ cleanup_csr(); - class_simple_destroy(hpsb_protocol_class); + class_destroy(hpsb_protocol_class); class_unregister(&hpsb_host_class); for (i = 0; fw_bus_attrs[i]; i++) bus_remove_file(&ieee1394_bus_type, fw_bus_attrs[i]); Index: linux-2.6.12-rc2/drivers/ieee1394/ieee1394_core.h =================================================================== --- linux-2.6.12-rc2.orig/drivers/ieee1394/ieee1394_core.h 2005-03-21 22:44:54.000000000 -0800 +++ linux-2.6.12-rc2/drivers/ieee1394/ieee1394_core.h 2005-04-05 14:05:44.000000000 -0700 @@ -223,6 +223,7 @@ /* Our sysfs bus entry */ extern struct bus_type ieee1394_bus_type; extern struct class hpsb_host_class; -extern struct class_simple *hpsb_protocol_class; +extern struct class *hpsb_protocol_class; #endif /* _IEEE1394_CORE_H */ + Index: linux-2.6.12-rc2/drivers/ieee1394/raw1394.c =================================================================== --- linux-2.6.12-rc2.orig/drivers/ieee1394/raw1394.c 2005-04-05 00:11:58.000000000 -0700 +++ linux-2.6.12-rc2/drivers/ieee1394/raw1394.c 2005-04-05 14:06:30.000000000 -0700 @@ -2901,7 +2901,7 @@ hpsb_register_highlevel(&raw1394_highlevel); - if (IS_ERR(class_simple_device_add(hpsb_protocol_class, MKDEV( + if (IS_ERR(class_device_create(hpsb_protocol_class, MKDEV( IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), NULL, RAW1394_DEVICE_NAME))) { ret = -EFAULT; @@ -2934,8 +2934,8 @@ out_dev: devfs_remove(RAW1394_DEVICE_NAME); - class_simple_device_remove(MKDEV( - IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)); + class_device_destroy(hpsb_protocol_class, + MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)); out_unreg: hpsb_unregister_highlevel(&raw1394_highlevel); out: @@ -2944,8 +2944,8 @@ static void __exit cleanup_raw1394(void) { - class_simple_device_remove(MKDEV( - IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)); + class_device_destroy(hpsb_protocol_class, + MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)); cdev_del(&raw1394_cdev); devfs_remove(RAW1394_DEVICE_NAME); hpsb_unregister_highlevel(&raw1394_highlevel); Index: linux-2.6.12-rc2/drivers/ieee1394/video1394.c =================================================================== --- linux-2.6.12-rc2.orig/drivers/ieee1394/video1394.c 2005-04-05 00:11:58.000000000 -0700 +++ linux-2.6.12-rc2/drivers/ieee1394/video1394.c 2005-04-05 14:05:44.000000000 -0700 @@ -1323,7 +1323,7 @@ hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id); minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id; - class_simple_device_add(hpsb_protocol_class, MKDEV( + class_device_create(hpsb_protocol_class, MKDEV( IEEE1394_MAJOR, minor), NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id); devfs_mk_cdev(MKDEV(IEEE1394_MAJOR, minor), @@ -1337,7 +1337,7 @@ struct ti_ohci *ohci = hpsb_get_hostinfo(&video1394_highlevel, host); if (ohci) { - class_simple_device_remove(MKDEV(IEEE1394_MAJOR, + class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id)); devfs_remove("%s/%d", VIDEO1394_DRIVER_NAME, ohci->host->id); }