omap1: mailbox: kill compile warning

use ioremap and remove unused variable to get rid
of compile warnings.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index a2d07aa75c9e98e5b53951e158a0aca5f12b12ae..379100c176392a199a8da2235374a922c29ee3de 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -73,7 +73,7 @@ static inline void omap_init_rtc(void) {}
 #  define INT_DSP_MAILBOX1     INT_1610_DSP_MAILBOX1
 #endif
 
-#define OMAP1_MBOX_BASE                OMAP1_IO_ADDRESS(OMAP16XX_MAILBOX_BASE)
+#define OMAP1_MBOX_BASE                OMAP16XX_MAILBOX_BASE
 
 static struct resource mbox_resources[] = {
        {

diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
index caf889aaa248bba17a6d177bba01d63abb70bcdb..4f5b3da3d559a73957debe73409ef5959a2594aa 100644 (file)
--- a/arch/arm/mach-omap1/mailbox.c
+++ b/arch/arm/mach-omap1/mailbox.c
@@ -146,7 +146,6 @@ EXPORT_SYMBOL(mbox_dsp_info);
 static int __devinit omap1_mbox_probe(struct platform_device *pdev)
 {
        struct resource *res;
-       int ret = 0;
 
        if (pdev->num_resources != 2) {
                dev_err(&pdev->dev, "invalid number of resources: %d\n",
@@ -160,12 +159,18 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "invalid mem resource\n");
                return -ENODEV;
        }
-       mbox_base = res->start;
+
+       mbox_base = ioremap(res->start, resource_size(res));
+       if (!mbox_base) {
+               dev_err(&pdev->dev, "ioremap failed\n");
+               return -ENODEV;
+       }
 
        /* DSP IRQ */
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (unlikely(!res)) {
                dev_err(&pdev->dev, "invalid irq resource\n");
+               iounmap(mbox_base);
                return -ENODEV;
        }
        mbox_dsp_info.irq = res->start;