diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:42:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:42:07 +0100 |
| commit | 6aa447bcbb444cd1b738613a20627f288d631665 (patch) | |
| tree | 62030bb14be0006248181305ac1fe377a99e5b65 /drivers/mailbox/pcc.c | |
| parent | abedf8e2419fb873d919dd74de2e84b510259339 (diff) | |
| parent | 48be3a67da7413d62e5efbcf2c73a9dddf61fb96 (diff) | |
| download | linux-6aa447bcbb444cd1b738613a20627f288d631665.tar.bz2 | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/mailbox/pcc.c')
| -rw-r--r-- | drivers/mailbox/pcc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 45d85aea9955..8f779a1ec99c 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -81,16 +81,10 @@ static struct mbox_controller pcc_mbox_ctrl = {}; */ static struct mbox_chan *get_pcc_channel(int id) { - struct mbox_chan *pcc_chan; - if (id < 0 || id > pcc_mbox_ctrl.num_chans) return ERR_PTR(-ENOENT); - pcc_chan = (struct mbox_chan *) - (unsigned long) pcc_mbox_channels + - (id * sizeof(*pcc_chan)); - - return pcc_chan; + return &pcc_mbox_channels[id]; } /** |