* [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
@ 2009-11-13 12:33 C.A, Subramaniam
2009-11-14 0:40 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: C.A, Subramaniam @ 2009-11-13 12:33 UTC (permalink / raw)
To: Tony Lindgren, linux-omap@vger.kernel.org
Cc: Gupta, Ramesh, Kanigeri, Hari, Hiroshi DOYU
>From 177e2efb7384c03ac445b55e2e4ccf44e2160051 Mon Sep 17 00:00:00 2001
From: C A Subramaniam <subramaniam.ca@ti.com>
Date: Fri, 13 Nov 2009 15:04:57 +0530
Subject: [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
---
arch/arm/plat-omap/include/plat/mailbox.h | 12 ++++++++++++
arch/arm/plat-omap/mailbox.c | 12 ++----------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/mailbox.h b/arch/arm/plat-omap/include/plat/mailbox.h
index 8260a3f..bf06953 100644
--- a/arch/arm/plat-omap/include/plat/mailbox.h
+++ b/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/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index eb76df2..d5377a3 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/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);
}
--
1.5.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
2009-11-13 12:33 [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq() C.A, Subramaniam
@ 2009-11-14 0:40 ` Tony Lindgren
2009-11-17 13:07 ` C.A, Subramaniam
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2009-11-14 0:40 UTC (permalink / raw)
To: C.A, Subramaniam
Cc: linux-omap@vger.kernel.org, Gupta, Ramesh, Kanigeri, Hari,
Hiroshi DOYU
* C.A, Subramaniam <subramaniam.ca@ti.com> [091113 04:32]:
> From 177e2efb7384c03ac445b55e2e4ccf44e2160051 Mon Sep 17 00:00:00 2001
> From: C A Subramaniam <subramaniam.ca@ti.com>
> Date: Fri, 13 Nov 2009 15:04:57 +0530
> Subject: [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
>
> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Is this missing a Signed-off-by: C A Subramaniam <subramaniam.ca@ti.com>,
or should this be From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>?
Regards,
Tony
> ---
> arch/arm/plat-omap/include/plat/mailbox.h | 12 ++++++++++++
> arch/arm/plat-omap/mailbox.c | 12 ++----------
> 2 files changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/mailbox.h b/arch/arm/plat-omap/include/plat/mailbox.h
> index 8260a3f..bf06953 100644
> --- a/arch/arm/plat-omap/include/plat/mailbox.h
> +++ b/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/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
> index eb76df2..d5377a3 100644
> --- a/arch/arm/plat-omap/mailbox.c
> +++ b/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);
> }
> --
> 1.5.3.2
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
2009-11-14 0:40 ` Tony Lindgren
@ 2009-11-17 13:07 ` C.A, Subramaniam
2009-11-17 16:58 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: C.A, Subramaniam @ 2009-11-17 13:07 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap@vger.kernel.org, Gupta, Ramesh, Kanigeri, Hari,
Hiroshi DOYU
> -----Original Message-----
> From: Tony Lindgren [mailto:tony@atomide.com]
> Sent: Saturday, November 14, 2009 6:10 AM
> To: C.A, Subramaniam
> Cc: linux-omap@vger.kernel.org; Gupta, Ramesh; Kanigeri,
> Hari; Hiroshi DOYU
> Subject: Re: [PATCH 7/10] omap mailbox: expose
> omap_mbox_enable()/disable_irq()
>
> * C.A, Subramaniam <subramaniam.ca@ti.com> [091113 04:32]:
> > From 177e2efb7384c03ac445b55e2e4ccf44e2160051 Mon Sep 17
> 00:00:00 2001
> > From: C A Subramaniam <subramaniam.ca@ti.com>
> > Date: Fri, 13 Nov 2009 15:04:57 +0530
> > Subject: [PATCH 7/10] omap mailbox: expose
> > omap_mbox_enable()/disable_irq()
> >
> > Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
>
> Is this missing a Signed-off-by: C A Subramaniam
> <subramaniam.ca@ti.com>, or should this be From: Hiroshi DOYU
> <Hiroshi.DOYU@nokia.com>?
>
Hi Tony,
The patch is given by Hiroshi. Since it was sent as part of the OMAP4
Mailbox patch series the From has C A Subramaniam <subramaniam.ca@ti.com>
> Regards,
>
> Tony
>
> > ---
> > arch/arm/plat-omap/include/plat/mailbox.h | 12 ++++++++++++
> > arch/arm/plat-omap/mailbox.c | 12 ++----------
> > 2 files changed, 14 insertions(+), 10 deletions(-)
> >
> > diff --git a/arch/arm/plat-omap/include/plat/mailbox.h
> > b/arch/arm/plat-omap/include/plat/mailbox.h
> > index 8260a3f..bf06953 100644
> > --- a/arch/arm/plat-omap/include/plat/mailbox.h
> > +++ b/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/arch/arm/plat-omap/mailbox.c
> > b/arch/arm/plat-omap/mailbox.c index eb76df2..d5377a3 100644
> > --- a/arch/arm/plat-omap/mailbox.c
> > +++ b/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);
> > }
> > --
> > 1.5.3.2
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
2009-11-17 13:07 ` C.A, Subramaniam
@ 2009-11-17 16:58 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2009-11-17 16:58 UTC (permalink / raw)
To: C.A, Subramaniam
Cc: linux-omap@vger.kernel.org, Gupta, Ramesh, Kanigeri, Hari,
Hiroshi DOYU
* C.A, Subramaniam <subramaniam.ca@ti.com> [091117 05:06]:
> > -----Original Message-----
> > From: Tony Lindgren [mailto:tony@atomide.com]
> > Sent: Saturday, November 14, 2009 6:10 AM
> > To: C.A, Subramaniam
> > Cc: linux-omap@vger.kernel.org; Gupta, Ramesh; Kanigeri,
> > Hari; Hiroshi DOYU
> > Subject: Re: [PATCH 7/10] omap mailbox: expose
> > omap_mbox_enable()/disable_irq()
> >
> > * C.A, Subramaniam <subramaniam.ca@ti.com> [091113 04:32]:
> > > From 177e2efb7384c03ac445b55e2e4ccf44e2160051 Mon Sep 17
> > 00:00:00 2001
> > > From: C A Subramaniam <subramaniam.ca@ti.com>
> > > Date: Fri, 13 Nov 2009 15:04:57 +0530
> > > Subject: [PATCH 7/10] omap mailbox: expose
> > > omap_mbox_enable()/disable_irq()
> > >
> > > Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
> >
> > Is this missing a Signed-off-by: C A Subramaniam
> > <subramaniam.ca@ti.com>, or should this be From: Hiroshi DOYU
> > <Hiroshi.DOYU@nokia.com>?
> >
> Hi Tony,
> The patch is given by Hiroshi. Since it was sent as part of the OMAP4
> Mailbox patch series the From has C A Subramaniam <subramaniam.ca@ti.com>
OK, I'll change the From: field to be from Hiroshi then.
Regards,
Tony
> > Regards,
> >
> > Tony
> >
> > > ---
> > > arch/arm/plat-omap/include/plat/mailbox.h | 12 ++++++++++++
> > > arch/arm/plat-omap/mailbox.c | 12 ++----------
> > > 2 files changed, 14 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/arch/arm/plat-omap/include/plat/mailbox.h
> > > b/arch/arm/plat-omap/include/plat/mailbox.h
> > > index 8260a3f..bf06953 100644
> > > --- a/arch/arm/plat-omap/include/plat/mailbox.h
> > > +++ b/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/arch/arm/plat-omap/mailbox.c
> > > b/arch/arm/plat-omap/mailbox.c index eb76df2..d5377a3 100644
> > > --- a/arch/arm/plat-omap/mailbox.c
> > > +++ b/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);
> > > }
> > > --
> > > 1.5.3.2
> >
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
@ 2009-09-22 14:32 C.A, Subramaniam
0 siblings, 0 replies; 6+ messages in thread
From: C.A, Subramaniam @ 2009-09-22 14:32 UTC (permalink / raw)
To: linux-omap@vger.kernel.org
Cc: tony@atomide.com, rmk@arm.linux.org.uk, Hiroshi DOYU,
Kanigeri, Hari, Gupta, Ramesh
>From 1ba55e567917b48afc64a14202fd860b3332056d Mon Sep 17 00:00:00 2001
From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Date: Wed, 2 Sep 2009 20:18:53 +0530
Subject: [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
---
arch/arm/plat-omap/include/mach/mailbox.h | 12 ++++++++++++
arch/arm/plat-omap/mailbox.c | 12 ++----------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/arch/arm/plat-omap/include/mach/mailbox.h b/arch/arm/plat-omap/include/mach/mailbox.h
index 8260a3f..bf06953 100644
--- a/arch/arm/plat-omap/include/mach/mailbox.h
+++ b/arch/arm/plat-omap/include/mach/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/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 2899255..032f1fe 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/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);
}
--
1.5.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
@ 2009-09-04 11:48 C.A, Subramaniam
0 siblings, 0 replies; 6+ messages in thread
From: C.A, Subramaniam @ 2009-09-04 11:48 UTC (permalink / raw)
To: linux-omap@vger.kernel.org
Cc: tony@atomide.com, Hiroshi.DOYU@nokia.com, rmk@arm.linux.org.uk,
Kanigeri, Hari, Gupta, Ramesh
>From 76e10e3b49c987894164375b2f5171418b9778e5 Mon Sep 17 00:00:00 2001
From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Date: Wed, 2 Sep 2009 20:18:53 +0530
Subject: [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq()
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
---
arch/arm/plat-omap/include/mach/mailbox.h | 12 ++++++++++++
arch/arm/plat-omap/mailbox.c | 12 ++----------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/arch/arm/plat-omap/include/mach/mailbox.h b/arch/arm/plat-omap/include/mach/mailbox.h
index 8260a3f..bf06953 100644
--- a/arch/arm/plat-omap/include/mach/mailbox.h
+++ b/arch/arm/plat-omap/include/mach/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/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index b7c0d5f..f6d6b67 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/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)
@@ -145,7 +137,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);
@@ -197,7 +189,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);
}
--
1.5.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-11-17 16:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-13 12:33 [PATCH 7/10] omap mailbox: expose omap_mbox_enable()/disable_irq() C.A, Subramaniam
2009-11-14 0:40 ` Tony Lindgren
2009-11-17 13:07 ` C.A, Subramaniam
2009-11-17 16:58 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2009-09-22 14:32 C.A, Subramaniam
2009-09-04 11:48 C.A, Subramaniam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox