提交 f91ca05f 编写于 作者: S Suman Anna

omap: mailbox: correct the argument type for irq ops

The argument type used in the actual individual omap_mbox_ops
for irqs should be omap_mbox_irq_t instead of omap_mbox_type_t.
Signed-off-by: NSuman Anna <s-anna@ti.com>
上级 ecf305cf
...@@ -86,21 +86,21 @@ static int omap1_mbox_fifo_full(struct omap_mbox *mbox) ...@@ -86,21 +86,21 @@ static int omap1_mbox_fifo_full(struct omap_mbox *mbox)
/* irq */ /* irq */
static void static void
omap1_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_type_t irq) omap1_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
{ {
if (irq == IRQ_RX) if (irq == IRQ_RX)
enable_irq(mbox->irq); enable_irq(mbox->irq);
} }
static void static void
omap1_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_type_t irq) omap1_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
{ {
if (irq == IRQ_RX) if (irq == IRQ_RX)
disable_irq(mbox->irq); disable_irq(mbox->irq);
} }
static int static int
omap1_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_type_t irq) omap1_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
{ {
if (irq == IRQ_TX) if (irq == IRQ_TX)
return 0; return 0;
......
...@@ -61,9 +61,6 @@ struct omap_mbox2_priv { ...@@ -61,9 +61,6 @@ struct omap_mbox2_priv {
unsigned long irqdisable; unsigned long irqdisable;
}; };
static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
omap_mbox_type_t irq);
static inline unsigned int mbox_read_reg(size_t ofs) static inline unsigned int mbox_read_reg(size_t ofs)
{ {
return __raw_readl(mbox_base + ofs); return __raw_readl(mbox_base + ofs);
...@@ -124,8 +121,7 @@ static int omap2_mbox_fifo_full(struct omap_mbox *mbox) ...@@ -124,8 +121,7 @@ static int omap2_mbox_fifo_full(struct omap_mbox *mbox)
} }
/* Mailbox IRQ handle functions */ /* Mailbox IRQ handle functions */
static void omap2_mbox_enable_irq(struct omap_mbox *mbox, static void omap2_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
omap_mbox_type_t irq)
{ {
struct omap_mbox2_priv *p = mbox->priv; struct omap_mbox2_priv *p = mbox->priv;
u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit; u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
...@@ -135,8 +131,7 @@ static void omap2_mbox_enable_irq(struct omap_mbox *mbox, ...@@ -135,8 +131,7 @@ static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
mbox_write_reg(l, p->irqenable); mbox_write_reg(l, p->irqenable);
} }
static void omap2_mbox_disable_irq(struct omap_mbox *mbox, static void omap2_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
omap_mbox_type_t irq)
{ {
struct omap_mbox2_priv *p = mbox->priv; struct omap_mbox2_priv *p = mbox->priv;
u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit; u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
...@@ -147,8 +142,7 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox, ...@@ -147,8 +142,7 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
mbox_write_reg(bit, p->irqdisable); mbox_write_reg(bit, p->irqdisable);
} }
static void omap2_mbox_ack_irq(struct omap_mbox *mbox, static void omap2_mbox_ack_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
omap_mbox_type_t irq)
{ {
struct omap_mbox2_priv *p = mbox->priv; struct omap_mbox2_priv *p = mbox->priv;
u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit; u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
...@@ -159,8 +153,7 @@ static void omap2_mbox_ack_irq(struct omap_mbox *mbox, ...@@ -159,8 +153,7 @@ static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
mbox_read_reg(p->irqstatus); mbox_read_reg(p->irqstatus);
} }
static int omap2_mbox_is_irq(struct omap_mbox *mbox, static int omap2_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
omap_mbox_type_t irq)
{ {
struct omap_mbox2_priv *p = mbox->priv; struct omap_mbox2_priv *p = mbox->priv;
u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit; u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册