aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-07-21 23:03:34 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-16 12:24:45 -0400
commit3ee074bf432d24a92894397ac48ad2f2bb95efdc (patch)
tree03faf80fe0e2e29fc68763cfdee949792b5c3e2d /drivers/ide
parent77997aaadd34510ed73153a4cd60161257a9e289 (diff)
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-probe.c4
-rw-r--r--drivers/ide/ide-tape.c11
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index f27baa5f140e..19f8c7770a25 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -657,8 +657,8 @@ static int ide_register_port(ide_hwif_t *hwif)
657 goto out; 657 goto out;
658 } 658 }
659 659
660 hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev, 660 hwif->portdev = device_create(ide_port_class, &hwif->gendev,
661 MKDEV(0, 0), hwif, hwif->name); 661 MKDEV(0, 0), hwif, hwif->name);
662 if (IS_ERR(hwif->portdev)) { 662 if (IS_ERR(hwif->portdev)) {
663 ret = PTR_ERR(hwif->portdev); 663 ret = PTR_ERR(hwif->portdev);
664 device_unregister(&hwif->gendev); 664 device_unregister(&hwif->gendev);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 25ac60f53273..d879c7797cde 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2420,12 +2420,11 @@ static int ide_tape_probe(ide_drive_t *drive)
2420 2420
2421 idetape_setup(drive, tape, minor); 2421 idetape_setup(drive, tape, minor);
2422 2422
2423 device_create_drvdata(idetape_sysfs_class, &drive->gendev, 2423 device_create(idetape_sysfs_class, &drive->gendev,
2424 MKDEV(IDETAPE_MAJOR, minor), NULL, 2424 MKDEV(IDETAPE_MAJOR, minor), NULL, "%s", tape->name);
2425 "%s", tape->name); 2425 device_create(idetape_sysfs_class, &drive->gendev,
2426 device_create_drvdata(idetape_sysfs_class, &drive->gendev, 2426 MKDEV(IDETAPE_MAJOR, minor + 128), NULL,
2427 MKDEV(IDETAPE_MAJOR, minor + 128), NULL, 2427 "n%s", tape->name);
2428 "n%s", tape->name);
2429 2428
2430 g->fops = &idetape_block_ops; 2429 g->fops = &idetape_block_ops;
2431 ide_register_region(g); 2430 ide_register_region(g);