From: Aaro Koskinen Date: Wed, 31 Aug 2016 20:57:37 +0000 (+0300) Subject: staging: octeon: use passed interrupt number in the handler X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=513ff86386f6ba2ea5769f1ab3383036ab53d9f0;p=linux-beck.git 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 Signed-off-by: Greg Kroah-Hartman --- 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;