mailbox: omap: Move omap_mbox_irq_t into driver

This is only used internal to the driver, move it out of the
public header and into the driver file. While we are here,
this is not used as a bitwise, so drop that and make it a
simple enum type.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>

diff --git a/drivers/mailbox/omap-mailbox.c b/drivers/mailbox/omap-mailbox.c
index 8151722eef383481c44e778250424844b326c8e8..c083734b6954cba7625e07e5d91e9f5d18f45ede 100644 (file)
--- a/drivers/mailbox/omap-mailbox.c
+++ b/drivers/mailbox/omap-mailbox.c
@@ -51,6 +51,11 @@
 #define MBOX_INTR_CFG_TYPE1            0
 #define MBOX_INTR_CFG_TYPE2            1
 
+typedef enum {
+       IRQ_TX = 1,
+       IRQ_RX = 2,
+} omap_mbox_irq_t;
+
 struct omap_mbox_fifo {
        unsigned long msg;
        unsigned long fifo_stat;

diff --git a/include/linux/omap-mailbox.h b/include/linux/omap-mailbox.h
index f8ddf8e8141675b6b8cf29c205cac61d13d82ad4..3cc5c4ed7f5a671908120557d1818b8d93c39ff9 100644 (file)
--- a/include/linux/omap-mailbox.h
+++ b/include/linux/omap-mailbox.h
@@ -10,8 +10,4 @@ typedef uintptr_t mbox_msg_t;
 
 #define omap_mbox_message(data) (u32)(mbox_msg_t)(data)
 
-typedef int __bitwise omap_mbox_irq_t;
-#define IRQ_TX ((__force omap_mbox_irq_t) 1)
-#define IRQ_RX ((__force omap_mbox_irq_t) 2)
-
 #endif /* OMAP_MAILBOX_H */