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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
46e36683f4
commit
d2f5a7311b
@@ -99,27 +99,27 @@ static int dnv_handle_irq(struct uart_port *p)
|
||||
struct uart_8250_port *up = up_to_u8250p(p);
|
||||
unsigned int fisr = serial_port_in(p, INTEL_MID_UART_DNV_FISR);
|
||||
u32 status;
|
||||
int ret = IRQ_NONE;
|
||||
int ret = 0;
|
||||
int err;
|
||||
|
||||
if (fisr & BIT(2)) {
|
||||
err = hsu_dma_get_status(&mid->dma_chip, 1, &status);
|
||||
if (err > 0) {
|
||||
serial8250_rx_dma_flush(up);
|
||||
ret |= IRQ_HANDLED;
|
||||
ret |= 1;
|
||||
} else if (err == 0)
|
||||
ret |= hsu_dma_do_irq(&mid->dma_chip, 1, status);
|
||||
}
|
||||
if (fisr & BIT(1)) {
|
||||
err = hsu_dma_get_status(&mid->dma_chip, 0, &status);
|
||||
if (err > 0)
|
||||
ret |= IRQ_HANDLED;
|
||||
ret |= 1;
|
||||
else if (err == 0)
|
||||
ret |= hsu_dma_do_irq(&mid->dma_chip, 0, status);
|
||||
}
|
||||
if (fisr & BIT(0))
|
||||
ret |= serial8250_handle_irq(p, serial_port_in(p, UART_IIR));
|
||||
return ret;
|
||||
return IRQ_RETVAL(ret);
|
||||
}
|
||||
|
||||
#define DNV_DMA_CHAN_OFFSET 0x80
|
||||
|
Reference in New Issue
Block a user