aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-22 11:07:43 +0000
committerMark Brown <broonie@kernel.org>2014-11-22 11:07:43 +0000
commitfa19d84c61e05d8de81d71810998f217663b079e (patch)
treea6b70f83723e9cae51a202c535bc2b2943168dd4
parent42f11d14ce8d2d9ac2b8044b97522fbe51642468 (diff)
parent50881c752b92d9750ea0e3c49a504d9fe732e999 (diff)
downloadlinux-linaro-stable-fa19d84c61e05d8de81d71810998f217663b079e.tar.gz
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-14.11
-rw-r--r--drivers/mailbox/mailbox.c4
-rw-r--r--include/linux/mailbox_controller.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 9a937ef35068..afcb430508ec 100644
--- 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 9ee195b02444..d4cf96f07cfc 100644
--- 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;
};