OMAP: MBOX: N800: remaining updates for mailbox parts

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
index 877b8380cd45618dfd9fd02ecfcfb8591754cd0c..25e1d95063b4b62148ad2ac3745df2115ee482c5 100644 (file)
--- a/arch/arm/mach-omap1/mailbox.c
+++ b/arch/arm/mach-omap1/mailbox.c
@@ -109,7 +109,7 @@ omap1_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_type_t irq)
        return 1;
 }
 
-struct omap_mbox_ops omap1_mbox_ops = {
+static struct omap_mbox_ops omap1_mbox_ops = {
        .type = OMAP_MBOX_TYPE1,
        .fifo_read = omap1_mbox_fifo_read,
        .fifo_write = omap1_mbox_fifo_write,

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index e541e95d8dccce85c4a5a66d1ff545a0c242e24a..824fd2128ae1ae16d16f1057d26ae8a9377831db 100644 (file)
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -48,7 +48,7 @@
 #define MAILBOX_IRQSTATUS_3            0x118
 #define MAILBOX_IRQENABLE_3            0x11c
 
-unsigned long mbox_base;
+static unsigned long mbox_base;
 
 #define MAILBOX_IRQ_NOTFULL(n)         (1 << (2 * (n) + 1))
 #define MAILBOX_IRQ_NEWMSG(n)          (1 << (2 * (n)))
@@ -68,7 +68,7 @@ struct omap_mbox2_priv {
        u32 notfull_bit;
 };
 
-struct clk *mbox_ick_handle;
+static struct clk *mbox_ick_handle;
 
 static inline unsigned int mbox_read_reg(unsigned int reg)
 {
@@ -170,7 +170,7 @@ static inline int omap2_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_type_t irq
        return (enable & status & bit);
 }
 
-struct omap_mbox_ops omap2_mbox_ops = {
+static struct omap_mbox_ops omap2_mbox_ops = {
        .type = OMAP_MBOX_TYPE2,
        .startup = omap2_mbox_startup,
        .shutdown = omap2_mbox_shutdown,
@@ -294,7 +294,7 @@ static struct platform_driver omap2_mbox_driver = {
        },
 };
 
-int __init omap2_mbox_init(void)
+static int __init omap2_mbox_init(void)
 {
        return platform_driver_register(&omap2_mbox_driver);
 }

diff --git a/arch/arm/plat-omap/mailbox.h b/arch/arm/plat-omap/mailbox.h
index 9b6027135dead90885c7d1a6c70639fc5bf4d669..67c6740b8ad5833b07875391f6af154f9e760dcb 100644 (file)
--- a/arch/arm/plat-omap/mailbox.h
+++ b/arch/arm/plat-omap/mailbox.h
@@ -12,8 +12,6 @@
 #ifndef __ARCH_ARM_PLAT_MAILBOX_H
 #define __ARCH_ARM_PLAT_MAILBOX_H
 
-#define MBOX_NAME_LEN 255
-
 /*
  * Mailbox sequence bit API
  */