Commit 3ee074bf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

device create: ide: convert device_create_drvdata to device_create

Now that device_create() has been audited, rename things back to the
original call to be sane.

Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 77997aaa
...@@ -657,8 +657,8 @@ static int ide_register_port(ide_hwif_t *hwif) ...@@ -657,8 +657,8 @@ static int ide_register_port(ide_hwif_t *hwif)
goto out; goto out;
} }
hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev, hwif->portdev = device_create(ide_port_class, &hwif->gendev,
MKDEV(0, 0), hwif, hwif->name); MKDEV(0, 0), hwif, hwif->name);
if (IS_ERR(hwif->portdev)) { if (IS_ERR(hwif->portdev)) {
ret = PTR_ERR(hwif->portdev); ret = PTR_ERR(hwif->portdev);
device_unregister(&hwif->gendev); device_unregister(&hwif->gendev);
......
...@@ -2420,12 +2420,11 @@ static int ide_tape_probe(ide_drive_t *drive) ...@@ -2420,12 +2420,11 @@ static int ide_tape_probe(ide_drive_t *drive)
idetape_setup(drive, tape, minor); idetape_setup(drive, tape, minor);
device_create_drvdata(idetape_sysfs_class, &drive->gendev, device_create(idetape_sysfs_class, &drive->gendev,
MKDEV(IDETAPE_MAJOR, minor), NULL, MKDEV(IDETAPE_MAJOR, minor), NULL, "%s", tape->name);
"%s", tape->name); device_create(idetape_sysfs_class, &drive->gendev,
device_create_drvdata(idetape_sysfs_class, &drive->gendev, MKDEV(IDETAPE_MAJOR, minor + 128), NULL,
MKDEV(IDETAPE_MAJOR, minor + 128), NULL, "n%s", tape->name);
"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