2 files changed, 7 insertions, 9 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 2994523be7bf..0cb3d2bb3ab9 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1173,7 +1173,7 @@ static struct kobject *exact_match(dev_t dev, int *part, void *data)
 {
         struct gendisk *p = data;
         *part &= (1 << PARTN_BITS) - 1;
-        return &p->kobj;
+        return &p->dev.kobj;
 }
 
 static int exact_lock(dev_t dev, void *data)
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 7b9181b5469d..1495792d7917 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -4724,10 +4724,8 @@ static void ide_tape_release(struct kref *kref)
 
         drive->dsc_overlap = 0;
         drive->driver_data = NULL;
-        class_device_destroy(idetape_sysfs_class,
-                        MKDEV(IDETAPE_MAJOR, tape->minor));
-        class_device_destroy(idetape_sysfs_class,
-                        MKDEV(IDETAPE_MAJOR, tape->minor + 128));
+        device_destroy(idetape_sysfs_class, MKDEV(IDETAPE_MAJOR, tape->minor));
+        device_destroy(idetape_sysfs_class, MKDEV(IDETAPE_MAJOR, tape->minor + 128));
         idetape_devs[tape->minor] = NULL;
         g->private_data = NULL;
         put_disk(g);
@@ -4884,10 +4882,10 @@ static int ide_tape_probe(ide_drive_t *drive)
 
         idetape_setup(drive, tape, minor);
 
-        class_device_create(idetape_sysfs_class, NULL,
-                        MKDEV(IDETAPE_MAJOR, minor), &drive->gendev, "%s", tape->name);
-        class_device_create(idetape_sysfs_class, NULL,
-                        MKDEV(IDETAPE_MAJOR, minor + 128), &drive->gendev, "n%s", tape->name);
+        device_create(idetape_sysfs_class, &drive->gendev,
+                      MKDEV(IDETAPE_MAJOR, minor), "%s", tape->name);
+        device_create(idetape_sysfs_class, &drive->gendev,
+                        MKDEV(IDETAPE_MAJOR, minor + 128), "n%s", tape->name);
 
         g->fops = &idetape_block_ops;
         ide_register_region(g);