Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox fixes from Jassi Brar:
- fix getting element from the pcc-channels array by simply indexing
into it
- prevent building mailbox-test driver for archs that don't have IOMEM
* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: Fix dependencies for !HAS_IOMEM archs
mailbox: pcc: fix channel calculation in get_pcc_channel()
+2
-7
+1
drivers/mailbox/Kconfig
+1
drivers/mailbox/Kconfig
+1
-7
drivers/mailbox/pcc.c
+1
-7
drivers/mailbox/pcc.c
···
81
81
*/
82
82
static struct mbox_chan *get_pcc_channel(int id)
83
83
{
84
-
struct mbox_chan *pcc_chan;
85
-
86
84
if (id < 0 || id > pcc_mbox_ctrl.num_chans)
87
85
return ERR_PTR(-ENOENT);
88
86
89
-
pcc_chan = (struct mbox_chan *)
90
-
(unsigned long) pcc_mbox_channels +
91
-
(id * sizeof(*pcc_chan));
92
-
93
-
return pcc_chan;
87
+
return &pcc_mbox_channels[id];
94
88
}
95
89
96
90
/**