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.
  ...

4 files changed, 11 insertions, 15 deletions

diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 1f56d2c5b7f..200efc4d2c1 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -284,9 +284,9 @@ aoechr_init(void)
                 return PTR_ERR(aoe_class);
         }
         for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-                device_create_drvdata(aoe_class, NULL,
-                                      MKDEV(AOE_MAJOR, chardevs[i].minor),
-                                      NULL, chardevs[i].name);
+                device_create(aoe_class, NULL,
+                              MKDEV(AOE_MAJOR, chardevs[i].minor), NULL,
+                              chardevs[i].name);
 
         return 0;
 }
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index d731ca42f80..9dfa2716300 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -686,9 +686,8 @@ static int __init pg_init(void)
         for (unit = 0; unit < PG_UNITS; unit++) {
                 struct pg *dev = &devices[unit];
                 if (dev->present)
-                        device_create_drvdata(pg_class, NULL,
-                                              MKDEV(major, unit), NULL,
-                                              "pg%u", unit);
+                        device_create(pg_class, NULL, MKDEV(major, unit), NULL,
+                                      "pg%u", unit);
         }
         err = 0;
         goto out;
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 673b8b2fd33..5ae229656ea 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -979,12 +979,10 @@ static int __init pt_init(void)
 
         for (unit = 0; unit < PT_UNITS; unit++)
                 if (pt[unit].present) {
-                        device_create_drvdata(pt_class, NULL,
-                                              MKDEV(major, unit), NULL,
-                                              "pt%d", unit);
-                        device_create_drvdata(pt_class, NULL,
-                                              MKDEV(major, unit + 128), NULL,
-                                              "pt%dn", unit);
+                        device_create(pt_class, NULL, MKDEV(major, unit), NULL,
+                                      "pt%d", unit);
+                        device_create(pt_class, NULL, MKDEV(major, unit + 128),
+                                      NULL, "pt%dn", unit);
                 }
         goto out;
 
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 0e077150568..195ca7c720f 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -302,9 +302,8 @@ static struct kobj_type kobj_pkt_type_wqueue = {
 static void pkt_sysfs_dev_new(struct pktcdvd_device *pd)
 {
         if (class_pktcdvd) {
-                pd->dev = device_create_drvdata(class_pktcdvd, NULL,
-                                                pd->pkt_dev, NULL,
-                                                "%s", pd->name);
+                pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL,
+                                        "%s", pd->name);
                 if (IS_ERR(pd->dev))
                         pd->dev = NULL;
         }