From 32686536f5ece64d40664dd86da4136445930b81 Mon Sep 17 00:00:00 2001
From: C A Subramaniam <subramaniam.ca@ti.com>
Date: Sun, 22 Nov 2009 10:11:20 -0800
Subject: [PATCH] --- yaml --- r: 172810 b: refs/heads/master c:
 b2b6362e6c5f744776da633218029e99f1244694 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f823e1c941ac..61b1edd8e73f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2775e467ff4c60a4b3745b24bb2f75c92a3ecc69
+refs/heads/master: b2b6362e6c5f744776da633218029e99f1244694
diff --git a/trunk/arch/arm/plat-omap/include/plat/mailbox.h b/trunk/arch/arm/plat-omap/include/plat/mailbox.h
index 319306a8f44a..8260a3feeb6f 100644
--- a/trunk/arch/arm/plat-omap/include/plat/mailbox.h
+++ b/trunk/arch/arm/plat-omap/include/plat/mailbox.h
@@ -63,7 +63,7 @@ struct omap_mbox {
 	void			(*err_notify)(void);
 };
 
-int omap_mbox_msg_send(struct omap_mbox *, mbox_msg_t msg, void *);
+int omap_mbox_msg_send(struct omap_mbox *, mbox_msg_t msg);
 void omap_mbox_init_seq(struct omap_mbox *);
 
 struct omap_mbox *omap_mbox_get(const char *);
diff --git a/trunk/arch/arm/plat-omap/mailbox.c b/trunk/arch/arm/plat-omap/mailbox.c
index b49bb291c678..99ecf8037ddf 100644
--- a/trunk/arch/arm/plat-omap/mailbox.c
+++ b/trunk/arch/arm/plat-omap/mailbox.c
@@ -88,7 +88,6 @@ static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)
 
 struct omap_msg_tx_data {
 	mbox_msg_t	msg;
-	void		*arg;
 };
 
 static void omap_msg_tx_end_io(struct request *rq, int error)
@@ -97,7 +96,7 @@ static void omap_msg_tx_end_io(struct request *rq, int error)
 	__blk_put_request(rq->q, rq);
 }
 
-int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void* arg)
+int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)
 {
 	struct omap_msg_tx_data *tx_data;
 	struct request *rq;
@@ -114,7 +113,6 @@ int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void* arg)
 	}
 
 	tx_data->msg = msg;
-	tx_data->arg = arg;
 	rq->end_io = omap_msg_tx_end_io;
 	blk_insert_request(q, rq, 0, tx_data);