tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Suman Anna <s-anna@ti.com>
+7
-14
+3
-3
arch/arm/mach-omap1/mailbox.c
+3
-3
arch/arm/mach-omap1/mailbox.c
···
86
86
87
87
/* irq */
88
88
static void
89
-
omap1_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_type_t irq)
89
+
omap1_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
90
90
{
91
91
if (irq == IRQ_RX)
92
92
enable_irq(mbox->irq);
93
93
}
94
94
95
95
static void
96
-
omap1_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_type_t irq)
96
+
omap1_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
97
97
{
98
98
if (irq == IRQ_RX)
99
99
disable_irq(mbox->irq);
100
100
}
101
101
102
102
static int
103
-
omap1_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_type_t irq)
103
+
omap1_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
104
104
{
105
105
if (irq == IRQ_TX)
106
106
return 0;
+4
-11
arch/arm/mach-omap2/mailbox.c
+4
-11
arch/arm/mach-omap2/mailbox.c
···
61
61
unsigned long irqdisable;
62
62
};
63
63
64
-
static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
65
-
omap_mbox_type_t irq);
66
-
67
64
static inline unsigned int mbox_read_reg(size_t ofs)
68
65
{
69
66
return __raw_readl(mbox_base + ofs);
···
121
124
}
122
125
123
126
/* Mailbox IRQ handle functions */
124
-
static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
125
-
omap_mbox_type_t irq)
127
+
static void omap2_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
126
128
{
127
129
struct omap_mbox2_priv *p = mbox->priv;
128
130
u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
···
131
135
mbox_write_reg(l, p->irqenable);
132
136
}
133
137
134
-
static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
135
-
omap_mbox_type_t irq)
138
+
static void omap2_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
136
139
{
137
140
struct omap_mbox2_priv *p = mbox->priv;
138
141
u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
···
142
147
mbox_write_reg(bit, p->irqdisable);
143
148
}
144
149
145
-
static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
146
-
omap_mbox_type_t irq)
150
+
static void omap2_mbox_ack_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
147
151
{
148
152
struct omap_mbox2_priv *p = mbox->priv;
149
153
u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
···
153
159
mbox_read_reg(p->irqstatus);
154
160
}
155
161
156
-
static int omap2_mbox_is_irq(struct omap_mbox *mbox,
157
-
omap_mbox_type_t irq)
162
+
static int omap2_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
158
163
{
159
164
struct omap_mbox2_priv *p = mbox->priv;
160
165
u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;