github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Browse Source
This commit is contained in:
Mark Brown 2014-11-22 11:07:41 +00:00
commit 38dce4af8d
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mailbox/mailbox.c
View File

@ -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);

2
include/linux/mailbox_controller.h
View File

@ -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;
};