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 files changed, 2 insertions, 7 deletions

diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index 546d05f4358a..b2bbe8659bed 100644
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -81,6 +81,7 @@ config STI_MBOX
 config MAILBOX_TEST
         tristate "Mailbox Test Client"
         depends on OF
+        depends on HAS_IOMEM
         help
           Test client to help with testing new Controller driver
           implementations.
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];
 }
 
 /**