From: Ioana Radulescu Date: Fri, 23 Mar 2018 13:44:05 +0000 (-0500) Subject: staging: fsl-dpaa2/eth: Use generic irq handler X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fdc9b53201aca9211a515aaa6df9e458783de756;p=openwrt%2Fstaging%2Fblogic.git staging: fsl-dpaa2/eth: Use generic irq handler For the link state interrupt, we used a dummy non-threaded irq handler, which had the same implementation as the generic irq_default_primary_handler() function. Give up on using our own irq handler and let the kernel use the generic one instead. Signed-off-by: Ioana Radulescu Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index ac1a75042664..beb59593a6b7 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -2317,11 +2317,6 @@ static int poll_link_state(void *arg) return 0; } -static irqreturn_t dpni_irq0_handler(int irq_num, void *arg) -{ - return IRQ_WAKE_THREAD; -} - static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg) { u32 status = ~0; @@ -2356,8 +2351,7 @@ static int setup_irqs(struct fsl_mc_device *ls_dev) irq = ls_dev->irqs[0]; err = devm_request_threaded_irq(&ls_dev->dev, irq->msi_desc->irq, - dpni_irq0_handler, - dpni_irq0_handler_thread, + NULL, dpni_irq0_handler_thread, IRQF_NO_SUSPEND | IRQF_ONESHOT, dev_name(&ls_dev->dev), &ls_dev->dev); if (err < 0) {