Merge remote-tracking branches 'spi/topic/doc', 'spi/topic/dw' and 'spi/topic/flash...

diff --cc drivers/spi/spi.c
index e86148fd458bb62e35a6ec95369032251219eae6,47eff8012a7715c362eb3ac3e706f8a9ea6e71c2,47eff8012a7715c362eb3ac3e706f8a9ea6e71c2,f565cc8901a662a0efc9a0b593e53aeb22cd1c76..b30f03a99dfdfb6789b7fa0d9bfcc662a6db267c
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
--- 3/drivers/spi/spi.c
--- 4/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@@@ -1152,7 -1152,6 -1152,6 -1154,9 +1154,9 @@@@@ static void __spi_pump_messages(struct 
                }
        }
    
-       mutex_lock(&master->bus_lock_mutex);
+++     if (!bus_locked)
+++             mutex_lock(&master->bus_lock_mutex);
+++ 
        trace_spi_message_start(master->cur_msg);
    
        if (master->prepare_message) {
@@@@@ -1162,8 -1161,7 -1161,7 -1166,7 +1166,7 @@@@@
                                "failed to prepare message: %d\n", ret);
                        master->cur_msg->status = ret;
                        spi_finalize_current_message(master);
-                       mutex_unlock(&master->bus_lock_mutex);
---                     return;
+++                     goto out;
                }
                master->cur_msg_prepared = true;
        }
@@@@@ -1172,21 -1170,15 -1170,15 -1175,23 +1175,23 @@@@@
        if (ret) {
                master->cur_msg->status = ret;
                spi_finalize_current_message(master);
-               mutex_unlock(&master->bus_lock_mutex);
---             return;
+++             goto out;
        }
    
        ret = master->transfer_one_message(master, master->cur_msg);
        if (ret) {
                dev_err(&master->dev,
                        "failed to transfer one message from queue\n");
-               mutex_unlock(&master->bus_lock_mutex);
---             return;
+++             goto out;
        }
-       mutex_unlock(&master->bus_lock_mutex);
+++ 
+++ out:
+++     if (!bus_locked)
+++             mutex_unlock(&master->bus_lock_mutex);
 ++ 
 ++     /* Prod the scheduler in case transfer_one() was busy waiting */
-       cond_resched();
+++     if (!ret)
+++             cond_resched();
    }
    
    /**

diff --cc include/linux/spi/spi.h
Simple merge