Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk

Conflicts:
	drivers/mailbox/mailbox.c
	include/linux/mailbox_controller.h

diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 9a937ef350680752eb4c5b4a70dfccd7d27d2f9f..afcb430508eceac7887ee436ec19c15fcfad89cd 100644 (file)
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -126,7 +126,7 @@ static void poll_txdone(unsigned long data)
 
        if (resched)
                mod_timer(&mbox->poll, jiffies +
-                               msecs_to_jiffies(mbox->period));
+                               msecs_to_jiffies(mbox->txpoll_period));
 }
 
 /**
@@ -252,8 +252,6 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
 
        msg_submit(chan);
 
-       INIT_COMPLETION(chan->tx_complete);
-
        if (chan->txdone_method == TXDONE_BY_POLL)
                poll_txdone((unsigned long)chan->mbox);
 

diff --git a/include/linux/mailbox_controller.h b/include/linux/mailbox_controller.h
index 9ee195b024444275596eeb4d05f14cef5460819f..d4cf96f07cfc42452f7bafb1d546cf64b984319e 100644 (file)
--- a/include/linux/mailbox_controller.h
+++ b/include/linux/mailbox_controller.h
@@ -68,7 +68,6 @@ struct mbox_chan_ops {
  *                     last TX's status after these many millisecs
  * @of_xlate:          Controller driver specific mapping of channel via DT
  * @poll:              API private. Used to poll for TXDONE on all channels.
- * @period:            API private. Polling period.
  * @node:              API private. To hook into list of controllers.
  */
 struct mbox_controller {
@@ -83,7 +82,6 @@ struct mbox_controller {
                                      const struct of_phandle_args *sp);
        /* Internal to API */
        struct timer_list poll;
-       unsigned period;
        struct list_head node;
 };