Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core changes from Greg Kroah-Hartman:
 "Here's the big driver core pull request for 3.6-rc1.

  Unlike 3.5, this kernel should be a lot tamer, with the printk changes
  now settled down.  All we have here is some extcon driver updates, w1
  driver updates, a few printk cleanups that weren't needed for 3.5, but
  are good to have now, and some other minor fixes/changes in the driver
  core.

  All of these have been in the linux-next releases for a while now.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
  printk: Export struct log size and member offsets through vmcoreinfo
  Drivers: hv: Change the hex constant to a decimal constant
  driver core: don't trigger uevent after failure
  extcon: MAX77693: Add extcon-max77693 driver to support Maxim MAX77693 MUIC device
  sysfs: fail dentry revalidation after namespace change fix
  sysfs: fail dentry revalidation after namespace change
  extcon: spelling of detach in function doc
  extcon: arizona: Stop microphone detection if we give up on it
  extcon: arizona: Update cable reporting calls and split headset
  PM / Runtime: Do not increment device usage counts before probing
  kmsg - do not flush partial lines when the console is busy
  kmsg - export "continuation record" flag to /dev/kmsg
  kmsg - avoid warning for CONFIG_PRINTK=n compilations
  kmsg - properly print over-long continuation lines
  driver-core: Use kobj_to_dev instead of re-implementing it
  driver-core: Move kobj_to_dev from genhd.h to device.h
  driver core: Move deferred devices to the end of dpm_list before probing
  driver core: move uevent call to driver_register
  driver core: fix shutdown races with probe/remove(v3)
  Extcon: Arizona: Add driver for Wolfson Arizona class devices
  ...

7 files changed, 69 insertions, 37 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 2bcef657a60c..181ed2660b33 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -743,7 +743,6 @@ int bus_add_driver(struct device_driver *drv)
                 }
         }
 
-        kobject_uevent(&priv->kobj, KOBJ_ADD);
         return 0;
 
 out_unregister:
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 346be8b78b24..f338037a4f3d 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -85,14 +85,13 @@ const char *dev_driver_string(const struct device *dev)
 }
 EXPORT_SYMBOL(dev_driver_string);
 
-#define to_dev(obj) container_of(obj, struct device, kobj)
 #define to_dev_attr(_attr) container_of(_attr, struct device_attribute, attr)
 
 static ssize_t dev_attr_show(struct kobject *kobj, struct attribute *attr,
                              char *buf)
 {
         struct device_attribute *dev_attr = to_dev_attr(attr);
-        struct device *dev = to_dev(kobj);
+        struct device *dev = kobj_to_dev(kobj);
         ssize_t ret = -EIO;
 
         if (dev_attr->show)
@@ -108,7 +107,7 @@ static ssize_t dev_attr_store(struct kobject *kobj, struct attribute *attr,
                               const char *buf, size_t count)
 {
         struct device_attribute *dev_attr = to_dev_attr(attr);
-        struct device *dev = to_dev(kobj);
+        struct device *dev = kobj_to_dev(kobj);
         ssize_t ret = -EIO;
 
         if (dev_attr->store)
@@ -182,7 +181,7 @@ EXPORT_SYMBOL_GPL(device_show_int);
  */
 static void device_release(struct kobject *kobj)
 {
-        struct device *dev = to_dev(kobj);
+        struct device *dev = kobj_to_dev(kobj);
         struct device_private *p = dev->p;
 
         if (dev->release)
@@ -200,7 +199,7 @@ static void device_release(struct kobject *kobj)
 
 static const void *device_namespace(struct kobject *kobj)
 {
-        struct device *dev = to_dev(kobj);
+        struct device *dev = kobj_to_dev(kobj);
         const void *ns = NULL;
 
         if (dev->class && dev->class->ns_type)
@@ -221,7 +220,7 @@ static int dev_uevent_filter(struct kset *kset, struct kobject *kobj)
         struct kobj_type *ktype = get_ktype(kobj);
 
         if (ktype == &device_ktype) {
-                struct device *dev = to_dev(kobj);
+                struct device *dev = kobj_to_dev(kobj);
                 if (dev->bus)
                         return 1;
                 if (dev->class)
@@ -232,7 +231,7 @@ static int dev_uevent_filter(struct kset *kset, struct kobject *kobj)
 
 static const char *dev_uevent_name(struct kset *kset, struct kobject *kobj)
 {
-        struct device *dev = to_dev(kobj);
+        struct device *dev = kobj_to_dev(kobj);
 
         if (dev->bus)
                 return dev->bus->name;
@@ -244,7 +243,7 @@ static const char *dev_uevent_name(struct kset *kset, struct kobject *kobj)
 static int dev_uevent(struct kset *kset, struct kobject *kobj,
                       struct kobj_uevent_env *env)
 {
-        struct device *dev = to_dev(kobj);
+        struct device *dev = kobj_to_dev(kobj);
         int retval = 0;
 
         /* add device node properties if present */
@@ -1132,7 +1131,7 @@ int device_register(struct device *dev)
  */
 struct device *get_device(struct device *dev)
 {
-        return dev ? to_dev(kobject_get(&dev->kobj)) : NULL;
+        return dev ? kobj_to_dev(kobject_get(&dev->kobj)) : NULL;
 }
 
 /**
@@ -1754,25 +1753,25 @@ int device_move(struct device *dev, struct device *new_parent,
                 set_dev_node(dev, dev_to_node(new_parent));
         }
 
-        if (!dev->class)
-                goto out_put;
-        error = device_move_class_links(dev, old_parent, new_parent);
-        if (error) {
-                /* We ignore errors on cleanup since we're hosed anyway... */
-                device_move_class_links(dev, new_parent, old_parent);
-                if (!kobject_move(&dev->kobj, &old_parent->kobj)) {
-                        if (new_parent)
-                                klist_remove(&dev->p->knode_parent);
-                        dev->parent = old_parent;
-                        if (old_parent) {
-                                klist_add_tail(&dev->p->knode_parent,
-                                               &old_parent->p->klist_children);
-                                set_dev_node(dev, dev_to_node(old_parent));
+        if (dev->class) {
+                error = device_move_class_links(dev, old_parent, new_parent);
+                if (error) {
+                        /* We ignore errors on cleanup since we're hosed anyway... */
+                        device_move_class_links(dev, new_parent, old_parent);
+                        if (!kobject_move(&dev->kobj, &old_parent->kobj)) {
+                                if (new_parent)
+                                        klist_remove(&dev->p->knode_parent);
+                                dev->parent = old_parent;
+                                if (old_parent) {
+                                        klist_add_tail(&dev->p->knode_parent,
+                                                       &old_parent->p->klist_children);
+                                        set_dev_node(dev, dev_to_node(old_parent));
+                                }
                         }
+                        cleanup_glue_dir(dev, new_parent_kobj);
+                        put_device(new_parent);
+                        goto out;
                 }
-                cleanup_glue_dir(dev, new_parent_kobj);
-                put_device(new_parent);
-                goto out;
         }
         switch (dpm_order) {
         case DPM_ORDER_NONE:
@@ -1787,7 +1786,7 @@ int device_move(struct device *dev, struct device *new_parent,
                 device_pm_move_last(dev);
                 break;
         }
-out_put:
+
         put_device(old_parent);
 out:
         device_pm_unlock();
@@ -1812,6 +1811,13 @@ void device_shutdown(void)
         while (!list_empty(&devices_kset->list)) {
                 dev = list_entry(devices_kset->list.prev, struct device,
                                 kobj.entry);
+
+                /*
+                 * hold reference count of device's parent to
+                 * prevent it from being freed because parent's
+                 * lock is to be held
+                 */
+                get_device(dev->parent);
                 get_device(dev);
                 /*
                  * Make sure the device is off the kset list, in the
@@ -1820,6 +1826,11 @@ void device_shutdown(void)
                 list_del_init(&dev->kobj.entry);
                 spin_unlock(&devices_kset->list_lock);
 
+                /* hold lock to avoid race with probe/release */
+                if (dev->parent)
+                        device_lock(dev->parent);
+                device_lock(dev);
+
                 /* Don't allow any more runtime suspends */
                 pm_runtime_get_noresume(dev);
                 pm_runtime_barrier(dev);
@@ -1831,7 +1842,13 @@ void device_shutdown(void)
                         dev_dbg(dev, "shutdown\n");
                         dev->driver->shutdown(dev);
                 }
+
+                device_unlock(dev);
+                if (dev->parent)
+                        device_unlock(dev->parent);
+
                 put_device(dev);
+                put_device(dev->parent);
 
                 spin_lock(&devices_kset->list_lock);
         }
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index dcb8a6e48692..e3bbed8a617c 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -85,8 +85,20 @@ static void deferred_probe_work_func(struct work_struct *work)
                  * manipulate the deferred list
                  */
                 mutex_unlock(&deferred_probe_mutex);
+
+                /*
+                 * Force the device to the end of the dpm_list since
+                 * the PM code assumes that the order we add things to
+                 * the list is a good order for suspend but deferred
+                 * probe makes that very unsafe.
+                 */
+                device_pm_lock();
+                device_pm_move_last(dev);
+                device_pm_unlock();
+
                 dev_dbg(dev, "Retrying from deferred list\n");
                 bus_probe_device(dev);
+
                 mutex_lock(&deferred_probe_mutex);
 
                 put_device(dev);
@@ -283,6 +295,7 @@ probe_failed:
         devres_release_all(dev);
         driver_sysfs_remove(dev);
         dev->driver = NULL;
+        dev_set_drvdata(dev, NULL);
 
         if (ret == -EPROBE_DEFER) {
                 /* Driver requested deferred probing */
@@ -356,10 +369,9 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)
         pr_debug("bus: '%s': %s: matched device %s with driver %s\n",
                  drv->bus->name, __func__, dev_name(dev), drv->name);
 
-        pm_runtime_get_noresume(dev);
         pm_runtime_barrier(dev);
         ret = really_probe(dev, drv);
-        pm_runtime_put_sync(dev);
+        pm_runtime_idle(dev);
 
         return ret;
 }
@@ -406,9 +418,8 @@ int device_attach(struct device *dev)
                         ret = 0;
                 }
         } else {
-                pm_runtime_get_noresume(dev);
                 ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
-                pm_runtime_put_sync(dev);
+                pm_runtime_idle(dev);
         }
 out_unlock:
         device_unlock(dev);
@@ -487,6 +498,7 @@ static void __device_release_driver(struct device *dev)
                         drv->remove(dev);
                 devres_release_all(dev);
                 dev->driver = NULL;
+                dev_set_drvdata(dev, NULL);
                 klist_remove(&dev->p->knode_driver);
                 if (dev->bus)
                         blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index 24e88fe29ec1..c30f3e1d0efc 100644
--- a/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@ -493,6 +493,7 @@ EXPORT_SYMBOL_GPL(dma_buf_vmap);
 /**
  * dma_buf_vunmap - Unmap a vmap obtained by dma_buf_vmap.
  * @dmabuf:     [in]    buffer to vunmap
+ * @vaddr:      [in]    vmap to vunmap
  */
 void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
 {
diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index 1b85949e3d2f..560a7173f810 100644
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -186,6 +186,7 @@ EXPORT_SYMBOL(dma_release_from_coherent);
  * @vma:        vm_area for the userspace memory
  * @vaddr:      cpu address returned by dma_alloc_from_coherent
  * @size:       size of the memory buffer allocated by dma_alloc_from_coherent
+ * @ret:        result from remap_pfn_range()
  *
  * This checks whether the memory was allocated from the per-device
  * coherent memory pool and if so, maps that memory to the provided vma.
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 207c27ddf828..974e301a1ef0 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -185,8 +185,12 @@ int driver_register(struct device_driver *drv)
         if (ret)
                 return ret;
         ret = driver_add_groups(drv, drv->groups);
-        if (ret)
+        if (ret) {
                 bus_remove_driver(drv);
+                return ret;
+        }
+        kobject_uevent(&drv->p->kobj, KOBJ_ADD);
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(driver_register);
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 5401814c874d..803cfc1597a9 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -22,8 +22,6 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 
-#define to_dev(obj) container_of(obj, struct device, kobj)
-
 MODULE_AUTHOR("Manuel Estrada Sainz");
 MODULE_DESCRIPTION("Multi purpose firmware loading support");
 MODULE_LICENSE("GPL");
@@ -290,7 +288,7 @@ static ssize_t firmware_data_read(struct file *filp, struct kobject *kobj,
                                   struct bin_attribute *bin_attr,
                                   char *buffer, loff_t offset, size_t count)
 {
-        struct device *dev = to_dev(kobj);
+        struct device *dev = kobj_to_dev(kobj);
         struct firmware_priv *fw_priv = to_firmware_priv(dev);
         struct firmware *fw;
         ssize_t ret_count;
@@ -384,7 +382,7 @@ static ssize_t firmware_data_write(struct file *filp, struct kobject *kobj,
                                    struct bin_attribute *bin_attr,
                                    char *buffer, loff_t offset, size_t count)
 {
-        struct device *dev = to_dev(kobj);
+        struct device *dev = kobj_to_dev(kobj);
         struct firmware_priv *fw_priv = to_firmware_priv(dev);
         struct firmware *fw;
         ssize_t retval;