[PATCH] class: convert drivers/ieee1394/* to use the new class api instead of class_simple
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

zatwierdzone przez
Greg Kroah-Hartman

rodzic
ca8eca6884
commit
7e25ab9155
@@ -2901,7 +2901,7 @@ static int __init init_raw1394(void)
|
||||
|
||||
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 @@ static int __init init_raw1394(void)
|
||||
|
||||
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 @@ out:
|
||||
|
||||
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);
|
||||
|
Reference in New Issue
Block a user