omap: mailbox: trivial cleanups

And fix a few compilation warnings.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

2 files changed, 3 insertions, 5 deletions

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 379100c17639..462b59c5d87a 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -73,12 +73,10 @@ static inline void omap_init_rtc(void) {}
 #  define INT_DSP_MAILBOX1      INT_1610_DSP_MAILBOX1
 #endif
 
-#define OMAP1_MBOX_BASE         OMAP16XX_MAILBOX_BASE
-
 static struct resource mbox_resources[] = {
         {
-                .start          = OMAP1_MBOX_BASE,
-                .end            = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,
+                .start          = OMAP16XX_MAILBOX_BASE,
+                .end            = OMAP16XX_MAILBOX_BASE + OMAP1_MBOX_SIZE,
                 .flags          = IORESOURCE_MEM,
         },
         {
diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
index 4f5b3da3d559..15bf2a29bbcd 100644
--- a/arch/arm/mach-omap1/mailbox.c
+++ b/arch/arm/mach-omap1/mailbox.c
@@ -83,7 +83,7 @@ static int omap1_mbox_fifo_full(struct omap_mbox *mbox)
         struct omap_mbox1_fifo *fifo =
                 &((struct omap_mbox1_priv *)mbox->priv)->rx_fifo;
 
-        return (mbox_read_reg(fifo->flag));
+        return mbox_read_reg(fifo->flag);
 }
 
 /* irq */