Commit dbc1272e authored by Tony Jones's avatar Tony Jones Committed by Greg Kroah-Hartman

IDE: Convert from class_device to device for ide-tape

Signed-off-by: default avatarTony Jones <tonyj@suse.de>
Cc: Gadi Oxman <gadio@netvision.net.il>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 891f78ea
...@@ -4724,10 +4724,8 @@ static void ide_tape_release(struct kref *kref) ...@@ -4724,10 +4724,8 @@ static void ide_tape_release(struct kref *kref)
drive->dsc_overlap = 0; drive->dsc_overlap = 0;
drive->driver_data = NULL; drive->driver_data = NULL;
class_device_destroy(idetape_sysfs_class, device_destroy(idetape_sysfs_class, MKDEV(IDETAPE_MAJOR, tape->minor));
MKDEV(IDETAPE_MAJOR, tape->minor)); device_destroy(idetape_sysfs_class, MKDEV(IDETAPE_MAJOR, tape->minor + 128));
class_device_destroy(idetape_sysfs_class,
MKDEV(IDETAPE_MAJOR, tape->minor + 128));
idetape_devs[tape->minor] = NULL; idetape_devs[tape->minor] = NULL;
g->private_data = NULL; g->private_data = NULL;
put_disk(g); put_disk(g);
...@@ -4884,10 +4882,10 @@ static int ide_tape_probe(ide_drive_t *drive) ...@@ -4884,10 +4882,10 @@ static int ide_tape_probe(ide_drive_t *drive)
idetape_setup(drive, tape, minor); idetape_setup(drive, tape, minor);
class_device_create(idetape_sysfs_class, NULL, device_create(idetape_sysfs_class, &drive->gendev,
MKDEV(IDETAPE_MAJOR, minor), &drive->gendev, "%s", tape->name); MKDEV(IDETAPE_MAJOR, minor), "%s", tape->name);
class_device_create(idetape_sysfs_class, NULL, device_create(idetape_sysfs_class, &drive->gendev,
MKDEV(IDETAPE_MAJOR, minor + 128), &drive->gendev, "n%s", tape->name); MKDEV(IDETAPE_MAJOR, minor + 128), "n%s", tape->name);
g->fops = &idetape_block_ops; g->fops = &idetape_block_ops;
ide_register_region(g); ide_register_region(g);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment