Commit 707b47b7 authored by David S. Miller's avatar David S. Miller

[FC4 SPARC]: Update for irqreturn_t.

parent ae558895
...@@ -335,7 +335,7 @@ static inline void soc_unsolicited (struct soc *s) ...@@ -335,7 +335,7 @@ static inline void soc_unsolicited (struct soc *s)
} }
} }
static void soc_intr(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t soc_intr(int irq, void *dev_id, struct pt_regs *regs)
{ {
u32 cmd; u32 cmd;
unsigned long flags; unsigned long flags;
...@@ -349,6 +349,8 @@ static void soc_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -349,6 +349,8 @@ static void soc_intr(int irq, void *dev_id, struct pt_regs *regs)
if (cmd & SOC_CMD_REQ_QALL) soc_request (s, cmd); if (cmd & SOC_CMD_REQ_QALL) soc_request (s, cmd);
} }
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
return IRQ_HANDLED;
} }
#define TOKEN(proto, port, token) (((proto)<<12)|(token)|(port)) #define TOKEN(proto, port, token) (((proto)<<12)|(token)|(port))
......
...@@ -405,7 +405,7 @@ static inline void socal_unsolicited (struct socal *s, unsigned long qno) ...@@ -405,7 +405,7 @@ static inline void socal_unsolicited (struct socal *s, unsigned long qno)
} }
} }
static void socal_intr(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t socal_intr(int irq, void *dev_id, struct pt_regs *regs)
{ {
u32 cmd; u32 cmd;
unsigned long flags; unsigned long flags;
...@@ -429,6 +429,8 @@ static void socal_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -429,6 +429,8 @@ static void socal_intr(int irq, void *dev_id, struct pt_regs *regs)
socal_request (s, cmd); socal_request (s, cmd);
} }
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
return IRQ_HANDLED;
} }
#define TOKEN(proto, port, token) (((proto)<<12)|(token)|(port)) #define TOKEN(proto, port, token) (((proto)<<12)|(token)|(port))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment