ARM: OMAP: Restructuring mailbox blk queues

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / mailbox.h

diff --git a/include/asm-arm/arch-omap/mailbox.h b/include/asm-arm/arch-omap/mailbox.h
index 8d12ced432b39f511d05d7f454ce0e47fb2ba9ef..4bf0909461f2b0f14a4f0a6f336911bdbe7f8e5e 100644 (file)
--- a/include/asm-arm/arch-omap/mailbox.h
+++ b/include/asm-arm/arch-omap/mailbox.h
@@ -35,18 +35,19 @@ struct omap_mbox_ops {
        int             (*is_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
 };
 
+struct omap_mbox_queue {
+       spinlock_t              lock;
+       request_queue_t         *queue;
+       struct work_struct      work;
+       int     (*callback)(void *);
+       struct omap_mbox        *mbox;
+};
+
 struct omap_mbox {
        char                    *name;
-       spinlock_t              lock;
        unsigned int            irq;
 
-       struct workqueue_struct *workq;
-       struct work_struct      msg_receive;
-
-       request_queue_t         *txq, *rxq;
-
-       void    (*msg_receive_cb)(mbox_msg_t);
-       int     (*msg_sender_cb)(void*);
+       struct omap_mbox_queue  *txq, *rxq;
 
        struct omap_mbox_ops    *ops;