diff options
author | C A Subramaniam <subramaniam.ca@ti.com> | 2009-11-22 13:11:20 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:24:33 -0500 |
commit | b2b6362e6c5f744776da633218029e99f1244694 (patch) | |
tree | 2f6d8cde74e4187f43f172eb1a0488fbfba7a9b1 | |
parent | 2775e467ff4c60a4b3745b24bb2f75c92a3ecc69 (diff) |
omap: mailbox: remove unnecessary arg for omap_mbox_msg_send
Also removed from tx_data
Signed-off-by: C A Subramaniam <subramaniam.ca@ti.com>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/plat-omap/include/plat/mailbox.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/mailbox.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/mailbox.h b/arch/arm/plat-omap/include/plat/mailbox.h index 319306a8f44a..8260a3feeb6f 100644 --- a/arch/arm/plat-omap/include/plat/mailbox.h +++ b/arch/arm/plat-omap/include/plat/mailbox.h | |||
@@ -63,7 +63,7 @@ struct omap_mbox { | |||
63 | void (*err_notify)(void); | 63 | void (*err_notify)(void); |
64 | }; | 64 | }; |
65 | 65 | ||
66 | int omap_mbox_msg_send(struct omap_mbox *, mbox_msg_t msg, void *); | 66 | int omap_mbox_msg_send(struct omap_mbox *, mbox_msg_t msg); |
67 | void omap_mbox_init_seq(struct omap_mbox *); | 67 | void omap_mbox_init_seq(struct omap_mbox *); |
68 | 68 | ||
69 | struct omap_mbox *omap_mbox_get(const char *); | 69 | struct omap_mbox *omap_mbox_get(const char *); |
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index b49bb291c678..99ecf8037ddf 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c | |||
@@ -88,7 +88,6 @@ static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg) | |||
88 | 88 | ||
89 | struct omap_msg_tx_data { | 89 | struct omap_msg_tx_data { |
90 | mbox_msg_t msg; | 90 | mbox_msg_t msg; |
91 | void *arg; | ||
92 | }; | 91 | }; |
93 | 92 | ||
94 | static void omap_msg_tx_end_io(struct request *rq, int error) | 93 | 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) | |||
97 | __blk_put_request(rq->q, rq); | 96 | __blk_put_request(rq->q, rq); |
98 | } | 97 | } |
99 | 98 | ||
100 | int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void* arg) | 99 | int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg) |
101 | { | 100 | { |
102 | struct omap_msg_tx_data *tx_data; | 101 | struct omap_msg_tx_data *tx_data; |
103 | struct request *rq; | 102 | struct request *rq; |
@@ -114,7 +113,6 @@ int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void* arg) | |||
114 | } | 113 | } |
115 | 114 | ||
116 | tx_data->msg = msg; | 115 | tx_data->msg = msg; |
117 | tx_data->arg = arg; | ||
118 | rq->end_io = omap_msg_tx_end_io; | 116 | rq->end_io = omap_msg_tx_end_io; |
119 | blk_insert_request(q, rq, 0, tx_data); | 117 | blk_insert_request(q, rq, 0, tx_data); |
120 | 118 | ||