diff options
| author |   Aaro Koskinen <aaro.koskinen@iki.fi> | 2016-08-31 23:57:37 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-02 14:46:53 +0200 |
| commit | 513ff86386f6ba2ea5769f1ab3383036ab53d9f0 (patch) | |
| tree | 6cb42b6179b22bc227fc0a945cf14120c203ed76 /drivers/staging/octeon | |
| parent | staging: octeon: disable rx interrupts in oct_rx_shutdown (diff) | |
| download | linux-dev-513ff86386f6ba2ea5769f1ab3383036ab53d9f0.tar.xz linux-dev-513ff86386f6ba2ea5769f1ab3383036ab53d9f0.zip | |
staging: octeon: use passed interrupt number in the handler
Use passed interrupt number in the handler, so we can avoid using
the global variable.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon')
| -rw-r--r-- | drivers/staging/octeon/ethernet-rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c index 5b26f2a76a40..808c4155f046 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c @@ -47,16 +47,16 @@ static struct napi_struct cvm_oct_napi; /** * cvm_oct_do_interrupt - interrupt handler. - * @cpl: Interrupt number. Unused + * @irq: Interrupt number. * @dev_id: Cookie to identify the device. Unused * * The interrupt occurs whenever the POW has packets in our group. * */ -static irqreturn_t cvm_oct_do_interrupt(int cpl, void *dev_id) +static irqreturn_t cvm_oct_do_interrupt(int irq, void *dev_id) { /* Disable the IRQ and start napi_poll. */ - disable_irq_nosync(OCTEON_IRQ_WORKQ0 + pow_receive_group); + disable_irq_nosync(irq); napi_schedule(&cvm_oct_napi); return IRQ_HANDLED; |