Skip to content

Commit

Permalink
omap: mailbox: Expose omap_mbox_enable()/disable_irq()
Browse files Browse the repository at this point in the history
Expose omap_mbox_enable()/disable_irq()

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
  • Loading branch information
Hiroshi DOYU authored and Tony Lindgren committed Nov 22, 2009
1 parent b2b6362 commit eb18858
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
12 changes: 12 additions & 0 deletions arch/arm/plat-omap/include/plat/mailbox.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
12 changes: 2 additions & 10 deletions arch/arm/plat-omap/mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit eb18858

Please sign in to comment.