Commit 1ed24d74 authored by David S. Miller's avatar David S. Miller

[NET]: Use irqreturn_t in acenic driver.

parent 6be2745d
...@@ -2428,7 +2428,7 @@ static inline void ace_tx_int(struct net_device *dev, ...@@ -2428,7 +2428,7 @@ static inline void ace_tx_int(struct net_device *dev,
} }
static void ace_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) static irqreturn_t ace_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
{ {
struct ace_private *ap; struct ace_private *ap;
struct ace_regs *regs; struct ace_regs *regs;
...@@ -2446,7 +2446,7 @@ static void ace_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) ...@@ -2446,7 +2446,7 @@ static void ace_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
* spending any time in here. * spending any time in here.
*/ */
if (!(readl(&regs->HostCtrl) & IN_INT)) if (!(readl(&regs->HostCtrl) & IN_INT))
return; return IRQ_NONE;
/* /*
* ACK intr now. Otherwise we will lose updates to rx_ret_prd, * ACK intr now. Otherwise we will lose updates to rx_ret_prd,
...@@ -2552,6 +2552,8 @@ static void ace_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) ...@@ -2552,6 +2552,8 @@ static void ace_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
tasklet_schedule(&ap->ace_tasklet); tasklet_schedule(&ap->ace_tasklet);
} }
} }
return IRQ_HANDLED;
} }
......
...@@ -781,7 +781,7 @@ static int ace_init(struct net_device *dev); ...@@ -781,7 +781,7 @@ static int ace_init(struct net_device *dev);
static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs); static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs);
static void ace_load_mini_rx_ring(struct ace_private *ap, int nr_bufs); static void ace_load_mini_rx_ring(struct ace_private *ap, int nr_bufs);
static void ace_load_jumbo_rx_ring(struct ace_private *ap, int nr_bufs); static void ace_load_jumbo_rx_ring(struct ace_private *ap, int nr_bufs);
static void ace_interrupt(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t ace_interrupt(int irq, void *dev_id, struct pt_regs *regs);
static int ace_load_firmware(struct net_device *dev); static int ace_load_firmware(struct net_device *dev);
static int ace_open(struct net_device *dev); static int ace_open(struct net_device *dev);
static int ace_start_xmit(struct sk_buff *skb, struct net_device *dev); static int ace_start_xmit(struct sk_buff *skb, struct net_device *dev);
......
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