diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-22 11:07:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-22 11:07:41 +0000 |
| commit | 38dce4af8de2655716b67600a552eded6407ea2f (patch) | |
| tree | f40d42e46a1e7723c8654af83e59c55363e8d318 | |
| parent | 5d0676ad297dc9ac5f8a39070ddfb2245d3c7301 (diff) | |
| parent | 50881c752b92d9750ea0e3c49a504d9fe732e999 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-android-14.11
| -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 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; }; |