projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull thermal into release branch
[linux-drm-fsl-dcu.git]
/
arch
/
m68k
/
amiga
/
cia.c
diff --git
a/arch/m68k/amiga/cia.c
b/arch/m68k/amiga/cia.c
index dbad30054721cf5a1a892f8f23c9c4e3f941c9e3..c4a4ffd45bc0feeb68c8f84ff3332e1ac7bc4dd9 100644
(file)
--- a/
arch/m68k/amiga/cia.c
+++ b/
arch/m68k/amiga/cia.c
@@
-82,7
+82,7
@@
unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)
return old;
}
return old;
}
-static irqreturn_t cia_handler(int irq, void *dev_id
, struct pt_regs *fp
)
+static irqreturn_t cia_handler(int irq, void *dev_id)
{
struct ciabase *base = (struct ciabase *)dev_id;
int mach_irq;
{
struct ciabase *base = (struct ciabase *)dev_id;
int mach_irq;
@@
-93,7
+93,7
@@
static irqreturn_t cia_handler(int irq, void *dev_id, struct pt_regs *fp)
amiga_custom.intreq = base->int_mask;
for (; ints; mach_irq++, ints >>= 1) {
if (ints & 1)
amiga_custom.intreq = base->int_mask;
for (; ints; mach_irq++, ints >>= 1) {
if (ints & 1)
- m68k_handle_int(mach_irq
, fp
);
+ m68k_handle_int(mach_irq);
}
return IRQ_HANDLED;
}
}
return IRQ_HANDLED;
}
@@
-123,7
+123,7
@@
static void cia_disable_irq(unsigned int irq)
static struct irq_controller cia_irq_controller = {
.name = "cia",
static struct irq_controller cia_irq_controller = {
.name = "cia",
- .lock =
SPIN_LOCK_UNLOCKED
,
+ .lock =
__SPIN_LOCK_UNLOCKED(cia_irq_controller.lock)
,
.enable = cia_enable_irq,
.disable = cia_disable_irq,
};
.enable = cia_enable_irq,
.disable = cia_disable_irq,
};
@@
-160,7
+160,7
@@
static void auto_disable_irq(unsigned int irq)
static struct irq_controller auto_irq_controller = {
.name = "auto",
static struct irq_controller auto_irq_controller = {
.name = "auto",
- .lock =
SPIN_LOCK_UNLOCKED
,
+ .lock =
__SPIN_LOCK_UNLOCKED(auto_irq_controller.lock)
,
.enable = auto_enable_irq,
.disable = auto_disable_irq,
};
.enable = auto_enable_irq,
.disable = auto_disable_irq,
};