Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (46 commits)
  UIO: Fix mapping of logical and virtual memory
  UIO: add automata sercos3 pci card support
  UIO: Change driver name of uio_pdrv
  UIO: Add alignment warnings for uio-mem
  Driver core: add bus_sort_breadthfirst() function
  NET: convert the phy_device file to use bus_find_device_by_name
  kobject: Cleanup kobject_rename and !CONFIG_SYSFS
  kobject: Fix kobject_rename and !CONFIG_SYSFS
  sysfs: Make dir and name args to sysfs_notify() const
  platform: add new device registration helper
  sysfs: use ilookup5() instead of ilookup5_nowait()
  PNP: create device attributes via default device attributes
  Driver core: make bus_find_device_by_name() more robust
  usb: turn dev_warn+WARN_ON combos into dev_WARN
  debug: use dev_WARN() rather than WARN_ON() in device_pm_add()
  debug: Introduce a dev_WARN() function
  sysfs: fix deadlock
  device model: Do a quickcheck for driver binding before doing an expensive check
  Driver core: Fix cleanup in device_create_vargs().
  Driver core: Clarify device cleanup.
  ...

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)
                 goto out;
         }
 
-        hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev,
-                                              MKDEV(0, 0), hwif, hwif->name);
+        hwif->portdev = device_create(ide_port_class, &hwif->gendev,
+                                      MKDEV(0, 0), hwif, hwif->name);
         if (IS_ERR(hwif->portdev)) {
                 ret = PTR_ERR(hwif->portdev);
                 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)
 
         idetape_setup(drive, tape, minor);
 
-        device_create_drvdata(idetape_sysfs_class, &drive->gendev,
-                              MKDEV(IDETAPE_MAJOR, minor), NULL,
-                              "%s", tape->name);
-        device_create_drvdata(idetape_sysfs_class, &drive->gendev,
-                              MKDEV(IDETAPE_MAJOR, minor + 128), NULL,
-                              "n%s", tape->name);
+        device_create(idetape_sysfs_class, &drive->gendev,
+                      MKDEV(IDETAPE_MAJOR, minor), NULL, "%s", tape->name);
+        device_create(idetape_sysfs_class, &drive->gendev,
+                      MKDEV(IDETAPE_MAJOR, minor + 128), NULL,
+                      "n%s", tape->name);
 
         g->fops = &idetape_block_ops;
         ide_register_region(g);