From 15110464c8e2733f890b52d98559aa72093646e9 Mon Sep 17 00:00:00 2001
From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Date: Sun, 22 Nov 2009 10:11:22 -0800
Subject: [PATCH] --- yaml --- r: 172811 b: refs/heads/master c:
 eb18858ebda7f4ef3d7de33e1b9bf11ac4cc137b h: refs/heads/master i:   172809:
 4805664d97aa3ae565f504f1529b95514e155c0d   172807:
 12f5b994337b83b9f30265e7abd5efebed7c794f v: v3

---
 [refs]                                          |  2 +-
 trunk/arch/arm/plat-omap/include/plat/mailbox.h | 12 ++++++++++++
 trunk/arch/arm/plat-omap/mailbox.c              | 12 ++----------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 61b1edd8e73f..a33b307e1d23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2b6362e6c5f744776da633218029e99f1244694
+refs/heads/master: eb18858ebda7f4ef3d7de33e1b9bf11ac4cc137b
diff --git a/trunk/arch/arm/plat-omap/include/plat/mailbox.h b/trunk/arch/arm/plat-omap/include/plat/mailbox.h
index 8260a3feeb6f..bf0695310bde 100644
--- a/trunk/arch/arm/plat-omap/include/plat/mailbox.h
+++ b/trunk/arch/arm/plat-omap/include/plat/mailbox.h
@@ -92,4 +92,16 @@ static inline void omap_mbox_restore_ctx(struct omap_mbox *mbox)
 	mbox->ops->restore_ctx(mbox);
 }
 
+static inline void omap_mbox_enable_irq(struct omap_mbox *mbox,
+					omap_mbox_irq_t irq)
+{
+	mbox->ops->enable_irq(mbox, irq);
+}
+
+static inline void omap_mbox_disable_irq(struct omap_mbox *mbox,
+					 omap_mbox_irq_t irq)
+{
+	mbox->ops->disable_irq(mbox, irq);
+}
+
 #endif /* MAILBOX_H */
diff --git a/trunk/arch/arm/plat-omap/mailbox.c b/trunk/arch/arm/plat-omap/mailbox.c
index 99ecf8037ddf..e6b31159f08b 100644
--- a/trunk/arch/arm/plat-omap/mailbox.c
+++ b/trunk/arch/arm/plat-omap/mailbox.c
@@ -50,14 +50,6 @@ static inline int mbox_fifo_full(struct omap_mbox *mbox)
 }
 
 /* Mailbox IRQ handle functions */
-static inline void enable_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
-{
-	mbox->ops->enable_irq(mbox, irq);
-}
-static inline void disable_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
-{
-	mbox->ops->disable_irq(mbox, irq);
-}
 static inline void ack_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
 {
 	if (mbox->ops->ack_irq)
@@ -144,7 +136,7 @@ static void mbox_tx_work(struct work_struct *work)
 
 		ret = __mbox_msg_send(mbox, tx_data->msg);
 		if (ret) {
-			enable_mbox_irq(mbox, IRQ_TX);
+			omap_mbox_enable_irq(mbox, IRQ_TX);
 			spin_lock(q->queue_lock);
 			blk_requeue_request(q, rq);
 			spin_unlock(q->queue_lock);
@@ -196,7 +188,7 @@ static void mbox_rxq_fn(struct request_queue *q)
 
 static void __mbox_tx_interrupt(struct omap_mbox *mbox)
 {
-	disable_mbox_irq(mbox, IRQ_TX);
+	omap_mbox_disable_irq(mbox, IRQ_TX);
 	ack_mbox_irq(mbox, IRQ_TX);
 	schedule_work(&mbox->txq->work);
 }