diff options
Diffstat (limited to 'drivers/ieee1394/ieee1394_core.c')
-rw-r--r-- | drivers/ieee1394/ieee1394_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c index a294e45c77cd..2d9a9b74e687 100644 --- a/drivers/ieee1394/ieee1394_core.c +++ b/drivers/ieee1394/ieee1394_core.c | |||
@@ -67,7 +67,7 @@ MODULE_LICENSE("GPL"); | |||
67 | 67 | ||
68 | /* Some globals used */ | 68 | /* Some globals used */ |
69 | const char *hpsb_speedto_str[] = { "S100", "S200", "S400", "S800", "S1600", "S3200" }; | 69 | const char *hpsb_speedto_str[] = { "S100", "S200", "S400", "S800", "S1600", "S3200" }; |
70 | struct class_simple *hpsb_protocol_class; | 70 | struct class *hpsb_protocol_class; |
71 | 71 | ||
72 | #ifdef CONFIG_IEEE1394_VERBOSEDEBUG | 72 | #ifdef CONFIG_IEEE1394_VERBOSEDEBUG |
73 | static void dump_packet(const char *text, quadlet_t *data, int size) | 73 | static void dump_packet(const char *text, quadlet_t *data, int size) |
@@ -1121,7 +1121,7 @@ static int __init ieee1394_init(void) | |||
1121 | if (ret < 0) | 1121 | if (ret < 0) |
1122 | goto release_all_bus; | 1122 | goto release_all_bus; |
1123 | 1123 | ||
1124 | hpsb_protocol_class = class_simple_create(THIS_MODULE, "ieee1394_protocol"); | 1124 | hpsb_protocol_class = class_create(THIS_MODULE, "ieee1394_protocol"); |
1125 | if (IS_ERR(hpsb_protocol_class)) { | 1125 | if (IS_ERR(hpsb_protocol_class)) { |
1126 | ret = PTR_ERR(hpsb_protocol_class); | 1126 | ret = PTR_ERR(hpsb_protocol_class); |
1127 | goto release_class_host; | 1127 | goto release_class_host; |
@@ -1159,7 +1159,7 @@ static int __init ieee1394_init(void) | |||
1159 | cleanup_csr: | 1159 | cleanup_csr: |
1160 | cleanup_csr(); | 1160 | cleanup_csr(); |
1161 | release_class_protocol: | 1161 | release_class_protocol: |
1162 | class_simple_destroy(hpsb_protocol_class); | 1162 | class_destroy(hpsb_protocol_class); |
1163 | release_class_host: | 1163 | release_class_host: |
1164 | class_unregister(&hpsb_host_class); | 1164 | class_unregister(&hpsb_host_class); |
1165 | release_all_bus: | 1165 | release_all_bus: |
@@ -1189,7 +1189,7 @@ static void __exit ieee1394_cleanup(void) | |||
1189 | 1189 | ||
1190 | cleanup_csr(); | 1190 | cleanup_csr(); |
1191 | 1191 | ||
1192 | class_simple_destroy(hpsb_protocol_class); | 1192 | class_destroy(hpsb_protocol_class); |
1193 | class_unregister(&hpsb_host_class); | 1193 | class_unregister(&hpsb_host_class); |
1194 | for (i = 0; fw_bus_attrs[i]; i++) | 1194 | for (i = 0; fw_bus_attrs[i]; i++) |
1195 | bus_remove_file(&ieee1394_bus_type, fw_bus_attrs[i]); | 1195 | bus_remove_file(&ieee1394_bus_type, fw_bus_attrs[i]); |