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

2 files changed, 18 insertions, 16 deletions

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index a0c8965c1a79..530a2d309063 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -334,7 +334,9 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
                         return;
                 }
 
+                mutex_lock(&master_dev->bus_mutex);
                 if (ds1wm_reset(ds1wm_data)) {
+                        mutex_unlock(&master_dev->bus_mutex);
                         dev_dbg(&ds1wm_data->pdev->dev,
                                 "pass: %d reset error (or no slaves)\n", pass);
                         break;
@@ -387,6 +389,7 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
 
                 }
                 if (ds1wm_data->read_error) {
+                        mutex_unlock(&master_dev->bus_mutex);
                         dev_err(&ds1wm_data->pdev->dev,
                                 "pass: %d read error, retrying\n", pass);
                         break;
@@ -400,6 +403,7 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
                 dev_dbg(&ds1wm_data->pdev->dev,
                         "pass: %d resetting bus\n", pass);
                 ds1wm_reset(ds1wm_data);
+                mutex_unlock(&master_dev->bus_mutex);
                 if ((r_prime & ((u64)1 << 63)) && (d & ((u64)1 << 63))) {
                         dev_err(&ds1wm_data->pdev->dev,
                                 "pass: %d bus error, retrying\n", pass);
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 291897c881be..4b0fcf3c2d03 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -178,6 +178,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
                 hdq_data->hdq_irqstatus, OMAP_HDQ_TIMEOUT);
         if (ret == 0) {
                 dev_dbg(hdq_data->dev, "TX wait elapsed\n");
+                ret = -ETIMEDOUT;
                 goto out;
         }
 
@@ -185,7 +186,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
         /* check irqstatus */
         if (!(*status & OMAP_HDQ_INT_STATUS_TXCOMPLETE)) {
                 dev_dbg(hdq_data->dev, "timeout waiting for"
-                        "TXCOMPLETE/RXCOMPLETE, %x", *status);
+                        " TXCOMPLETE/RXCOMPLETE, %x", *status);
                 ret = -ETIMEDOUT;
                 goto out;
         }
@@ -196,7 +197,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
                         OMAP_HDQ_FLAG_CLEAR, &tmp_status);
         if (ret) {
                 dev_dbg(hdq_data->dev, "timeout waiting GO bit"
-                        "return to zero, %x", tmp_status);
+                        " return to zero, %x", tmp_status);
         }
 
 out:
@@ -339,7 +340,7 @@ static int omap_hdq_break(struct hdq_data *hdq_data)
                         &tmp_status);
         if (ret)
                 dev_dbg(hdq_data->dev, "timeout waiting INIT&GO bits"
-                        "return to zero, %x", tmp_status);
+                        " return to zero, %x", tmp_status);
 
 out:
         mutex_unlock(&hdq_data->hdq_mutex);
@@ -351,7 +352,6 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
 {
         int ret = 0;
         u8 status;
-        unsigned long timeout = jiffies + OMAP_HDQ_TIMEOUT;
 
         ret = mutex_lock_interruptible(&hdq_data->hdq_mutex);
         if (ret < 0) {
@@ -369,22 +369,20 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
                         OMAP_HDQ_CTRL_STATUS_DIR | OMAP_HDQ_CTRL_STATUS_GO,
                         OMAP_HDQ_CTRL_STATUS_DIR | OMAP_HDQ_CTRL_STATUS_GO);
                 /*
-                 * The RX comes immediately after TX. It
-                 * triggers another interrupt before we
-                 * sleep. So we have to wait for RXCOMPLETE bit.
+                 * The RX comes immediately after TX.
                  */
-                while (!(hdq_data->hdq_irqstatus
-                        & OMAP_HDQ_INT_STATUS_RXCOMPLETE)
-                        && time_before(jiffies, timeout)) {
-                        schedule_timeout_uninterruptible(1);
-                }
+                wait_event_timeout(hdq_wait_queue,
+                                   (hdq_data->hdq_irqstatus
+                                    & OMAP_HDQ_INT_STATUS_RXCOMPLETE),
+                                   OMAP_HDQ_TIMEOUT);
+
                 hdq_reg_merge(hdq_data, OMAP_HDQ_CTRL_STATUS, 0,
                         OMAP_HDQ_CTRL_STATUS_DIR);
                 status = hdq_data->hdq_irqstatus;
                 /* check irqstatus */
                 if (!(status & OMAP_HDQ_INT_STATUS_RXCOMPLETE)) {
                         dev_dbg(hdq_data->dev, "timeout waiting for"
-                                "RXCOMPLETE, %x", status);
+                                " RXCOMPLETE, %x", status);
                         ret = -ETIMEDOUT;
                         goto out;
                 }
@@ -394,7 +392,7 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
 out:
         mutex_unlock(&hdq_data->hdq_mutex);
 rtn:
-        return 0;
+        return ret;
 
 }
 
@@ -456,7 +454,7 @@ static int omap_hdq_put(struct hdq_data *hdq_data)
 
         if (0 == hdq_data->hdq_usecount) {
                 dev_dbg(hdq_data->dev, "attempt to decrement use count"
-                        "when it is zero");
+                        " when it is zero");
                 ret = -EINVAL;
         } else {
                 hdq_data->hdq_usecount--;
@@ -524,7 +522,7 @@ static void omap_w1_write_byte(void *_hdq, u8 byte)
         mutex_unlock(&hdq_data->hdq_mutex);
 
         ret = hdq_write_byte(hdq_data, byte, &status);
-        if (ret == 0) {
+        if (ret < 0) {
                 dev_dbg(hdq_data->dev, "TX failure:Ctrl status %x\n", status);
                 return;
         }