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

18 files changed, 43 insertions, 49 deletions

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index b650b4e48e50..456f54db73e2 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -229,9 +229,8 @@ static int bsr_create_devs(struct device_node *bn)
                 if (result)
                         goto out_err;
 
-                cur->bsr_device = device_create_drvdata(bsr_class, NULL,
-                                                        cur->bsr_dev,
-                                                        cur, cur->bsr_name);
+                cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev,
+                                                cur, cur->bsr_name);
                 if (!cur->bsr_device) {
                         printk(KERN_ERR "device_create failed for %s\n",
                                cur->bsr_name);
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index ca7c72a486b2..85832ab924e6 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -508,8 +508,8 @@ static int __init dsp56k_init_driver(void)
                 err = PTR_ERR(dsp56k_class);
                 goto out_chrdev;
         }
-        device_create_drvdata(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0),
-                              NULL, "dsp56k");
+        device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL,
+                      "dsp56k");
 
         printk(banner);
         goto out;
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 6774572d3759..70e0ebc30bd0 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -745,12 +745,12 @@ static int __init ip2_loadmain(void)
 
                 pB = i2BoardPtrTable[i];
                 if (pB != NULL) {
-                        device_create_drvdata(ip2_class, NULL,
-                                              MKDEV(IP2_IPL_MAJOR, 4 * i),
-                                              NULL, "ipl%d", i);
-                        device_create_drvdata(ip2_class, NULL,
-                                              MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
-                                              NULL, "stat%d", i);
+                        device_create(ip2_class, NULL,
+                                      MKDEV(IP2_IPL_MAJOR, 4 * i),
+                                      NULL, "ipl%d", i);
+                        device_create(ip2_class, NULL,
+                                      MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
+                                      NULL, "stat%d", i);
 
                         for (box = 0; box < ABS_MAX_BOXES; box++)
                                 for (j = 0; j < ABS_BIGGEST_BOX; j++)
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 64e1c169e826..835a33c8d5f5 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -871,7 +871,7 @@ static void ipmi_new_smi(int if_num, struct device *device)
         entry->dev = dev;
 
         mutex_lock(&reg_list_mutex);
-        device_create_drvdata(ipmi_class, device, dev, NULL, "ipmi%d", if_num);
+        device_create(ipmi_class, device, dev, NULL, "ipmi%d", if_num);
         list_add(&entry->link, &reg_list);
         mutex_unlock(&reg_list_mutex);
 }
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 505d7a1f6b8c..44e5d60f517e 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -4600,9 +4600,8 @@ static int __init istallion_module_init(void)
 
         istallion_class = class_create(THIS_MODULE, "staliomem");
         for (i = 0; i < 4; i++)
-                device_create_drvdata(istallion_class, NULL,
-                                      MKDEV(STL_SIOMEMMAJOR, i),
-                                      NULL, "staliomem%d", i);
+                device_create(istallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
+                              NULL, "staliomem%d", i);
 
         return 0;
 err_deinit:
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 3f2719b9f77b..e444c2dba160 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -813,8 +813,8 @@ static int lp_register(int nr, struct parport *port)
         if (reset)
                 lp_reset(nr);
 
-        device_create_drvdata(lp_class, port->dev, MKDEV(LP_MAJOR, nr), NULL,
-                              "lp%d", nr);
+        device_create(lp_class, port->dev, MKDEV(LP_MAJOR, nr), NULL,
+                      "lp%d", nr);
 
         printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name, 
                (port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 672b08e694d0..6431f6921a67 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -992,9 +992,9 @@ static int __init chr_dev_init(void)
 
         mem_class = class_create(THIS_MODULE, "mem");
         for (i = 0; i < ARRAY_SIZE(devlist); i++)
-                device_create_drvdata(mem_class, NULL,
-                                      MKDEV(MEM_MAJOR, devlist[i].minor),
-                                      NULL, devlist[i].name);
+                device_create(mem_class, NULL,
+                              MKDEV(MEM_MAJOR, devlist[i].minor), NULL,
+                              devlist[i].name);
 
         return 0;
 }
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 999aa779c08a..a5e0db9d7662 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -217,8 +217,8 @@ int misc_register(struct miscdevice * misc)
                 misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
         dev = MKDEV(MISC_MAJOR, misc->minor);
 
-        misc->this_device = device_create_drvdata(misc_class, misc->parent,
-                                                  dev, NULL, "%s", misc->name);
+        misc->this_device = device_create(misc_class, misc->parent, dev, NULL,
+                                          "%s", misc->name);
         if (IS_ERR(misc->this_device)) {
                 err = PTR_ERR(misc->this_device);
                 goto out;
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 1c5bf99895ed..dbb912574569 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1871,7 +1871,7 @@ static int cm4000_probe(struct pcmcia_device *link)
                 return ret;
         }
 
-        device_create_drvdata(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);
+        device_create(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);
 
         return 0;
 }
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 2d7c906435b7..4f0723b07974 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -637,8 +637,7 @@ static int reader_probe(struct pcmcia_device *link)
                 return ret;
         }
 
-        device_create_drvdata(cmx_class, NULL, MKDEV(major, i), NULL,
-                              "cmx%d", i);
+        device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i);
 
         return 0;
 }
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index bee39fdfba73..c84c34fb1231 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -760,9 +760,8 @@ static const struct file_operations pp_fops = {
 
 static void pp_attach(struct parport *port)
 {
-        device_create_drvdata(ppdev_class, port->dev,
-                              MKDEV(PP_MAJOR, port->number),
-                              NULL, "parport%d", port->number);
+        device_create(ppdev_class, port->dev, MKDEV(PP_MAJOR, port->number),
+                      NULL, "parport%d", port->number);
 }
 
 static void pp_detach(struct parport *port)
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 47b8cf281d4a..e139372d0e69 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -131,8 +131,8 @@ raw_ioctl(struct inode *inode, struct file *filp,
 static void bind_device(struct raw_config_request *rq)
 {
         device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));
-        device_create_drvdata(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor),
-                              NULL, "raw%d", rq->raw_minor);
+        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor), NULL,
+                      "raw%d", rq->raw_minor);
 }
 
 /*
@@ -283,8 +283,7 @@ static int __init raw_init(void)
                 ret = PTR_ERR(raw_class);
                 goto error_region;
         }
-        device_create_drvdata(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL,
-                              "rawctl");
+        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
 
         return 0;
 
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 3ce60df14c0a..32b74de18f5f 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -444,8 +444,8 @@ scdrv_init(void)
                                 continue;
                         }
 
-                        device_create_drvdata(snsc_class, NULL, dev, NULL,
-                                              "%s", devname);
+                        device_create(snsc_class, NULL, dev, NULL,
+                                      "%s", devname);
 
                         ia64_sn_irtr_intr_enable(scd->scd_nasid,
                                                  0 /*ignored */ ,
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 8b8f07a7f505..963b03fb29e5 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -4743,8 +4743,8 @@ static int __init stallion_module_init(void)
         if (IS_ERR(stallion_class))
                 printk("STALLION: failed to create class\n");
         for (i = 0; i < 4; i++)
-                device_create_drvdata(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
-                                      NULL, "staliomem%d", i);
+                device_create(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
+                              NULL, "staliomem%d", i);
 
         return 0;
 err_unrtty:
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 3f48d88cffc0..59f472143f08 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2850,7 +2850,7 @@ struct device *tty_register_device(struct tty_driver *driver, unsigned index,
         else
                 tty_line_name(driver, index, name);
 
-        return device_create_drvdata(tty_class, device, dev, NULL, name);
+        return device_create(tty_class, device, dev, NULL, name);
 }
 EXPORT_SYMBOL(tty_register_device);
 
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index c2ae52dd53d1..4f3b3f95fc42 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -481,10 +481,10 @@ static struct class *vc_class;
 
 void vcs_make_sysfs(struct tty_struct *tty)
 {
-        device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1),
-                              NULL, "vcs%u", tty->index + 1);
-        device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129),
-                              NULL, "vcsa%u", tty->index + 1);
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1), NULL,
+                      "vcs%u", tty->index + 1);
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129), NULL,
+                      "vcsa%u", tty->index + 1);
 }
 
 void vcs_remove_sysfs(struct tty_struct *tty)
@@ -499,7 +499,7 @@ int __init vcs_init(void)
                 panic("unable to get major %d for vcs device", VCS_MAJOR);
         vc_class = class_create(THIS_MODULE, "vc");
 
-        device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
-        device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
         return 0;
 }
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 7a70a40ad639..ffc9254f7e02 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -886,10 +886,10 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         state[i].cur_part = 0;
         for (j = 0; j < MAX_PARTITIONS; ++j)
                 state[i].part_stat_rwi[j] = VIOT_IDLE;
-        device_create_drvdata(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i),
-                              NULL, "iseries!vt%d", i);
-        device_create_drvdata(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
-                              NULL, "iseries!nvt%d", i);
+        device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i), NULL,
+                      "iseries!vt%d", i);
+        device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80), NULL,
+                      "iseries!nvt%d", i);
         printk(VIOTAPE_KERN_INFO "tape iseries/vt%d is iSeries "
                         "resource %10.10s type %4.4s, model %3.3s\n",
                         i, viotape_unitinfo[i].rsrcname,
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 278c9857bcf5..ed132fe55d3d 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -657,8 +657,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,
                 goto failed3;
         }
 
-        device_create_drvdata(icap_class, dev, devt, NULL,
-                              "%s%d", DRIVER_NAME, id);
+        device_create(icap_class, dev, devt, NULL, "%s%d", DRIVER_NAME, id);
         return 0;               /* success */
 
  failed3: