diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-21 23:44:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-21 23:44:13 +0000 |
| commit | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (patch) | |
| tree | 5cdae3c83dc1fe6e0d92d6085a038a7d407c1ef5 | |
| parent | efbf0c1bc8f2d3496219d52c20a6ad7149a04443 (diff) | |
| parent | d0aaac8a9d2c3ad71252adcdbeebb045bce02c5a (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/mailbox' into linux-linaro-lsk-v3.14lsk-v3.14-14.11
Conflicts:
drivers/mailbox/mailbox.c
include/linux/mailbox_controller.h
| -rw-r--r-- | drivers/mailbox/mailbox.c | 4 | ||||
| -rw-r--r-- | include/linux/mailbox_controller.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 63ecc1723466..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); - reinit_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; }; |