summaryrefslogtreecommitdiffstats
path: root/drivers/dma/hsu/pci.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2016-08-23 16:09:40 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-02 15:05:48 +0200
commitd2f5a7311bcaed681a41cb3419b8fe92a7b68bf5 (patch)
tree9a7669cb11f6314817fced673fd63d26d7bc5153 /drivers/dma/hsu/pci.c
parent46e36683f433528bfb7e5754ca5c5c86c204c40a (diff)
downloadtalos-op-linux-d2f5a7311bcaed681a41cb3419b8fe92a7b68bf5.tar.gz
talos-op-linux-d2f5a7311bcaed681a41cb3419b8fe92a7b68bf5.zip
dmaengine: hsu: refactor hsu_dma_do_irq() to return int
Since we have nice macro IRQ_RETVAL() we would use it to convert a flag of handled interrupt from int to irqreturn_t. The rationale of doing this is: a) hence we implicitly mark hsu_dma_do_irq() as an auxiliary function that can't be used as interrupt handler directly, and b) to be in align with serial driver which is using serial8250_handle_irq() that returns plain int by design. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dma/hsu/pci.c')
-rw-r--r--drivers/dma/hsu/pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/hsu/pci.c b/drivers/dma/hsu/pci.c
index 9916058531d9..b51639f045ed 100644
--- a/drivers/dma/hsu/pci.c
+++ b/drivers/dma/hsu/pci.c
@@ -29,7 +29,7 @@ static irqreturn_t hsu_pci_irq(int irq, void *dev)
u32 dmaisr;
u32 status;
unsigned short i;
- irqreturn_t ret = IRQ_NONE;
+ int ret = 0;
int err;
dmaisr = readl(chip->regs + HSU_PCI_DMAISR);
@@ -37,14 +37,14 @@ static irqreturn_t hsu_pci_irq(int irq, void *dev)
if (dmaisr & 0x1) {
err = hsu_dma_get_status(chip, i, &status);
if (err > 0)
- ret |= IRQ_HANDLED;
+ ret |= 1;
else if (err == 0)
ret |= hsu_dma_do_irq(chip, i, status);
}
dmaisr >>= 1;
}
- return ret;
+ return IRQ_RETVAL(ret);
}
static int hsu_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
OpenPOWER on IntegriCloud