Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71d0bc65 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 29b4817d

drivers/dma/hsu/hsu.c

+4 −5
Original line number Diff line number Diff line
@@ -200,10 +200,9 @@ EXPORT_SYMBOL_GPL(hsu_dma_get_status); 
 *      is not a normal timeout interrupt, ie. hsu_dma_get_status() returned 0.

 *

 *      Return:

 *      IRQ_NONE for invalid channel number, IRQ_HANDLED otherwise.

 *      0 for invalid channel number, 1 otherwise.

 */

irqreturn_t hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr,

			   u32 status)

int hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr, u32 status)

{

	struct hsu_dma_chan *hsuc;

	struct hsu_dma_desc *desc;
@@ -211,7 +210,7 @@ irqreturn_t hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr, 


	/* Sanity check */

	if (nr >= chip->hsu->nr_channels)

		return IRQ_NONE;

		return 0;



	hsuc = &chip->hsu->chan[nr];
@@ -230,7 +229,7 @@ irqreturn_t hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr, 
	}

	spin_unlock_irqrestore(&hsuc->vchan.lock, flags);



	return IRQ_HANDLED;

	return 1;

}

EXPORT_SYMBOL_GPL(hsu_dma_do_irq);

drivers/dma/hsu/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

drivers/tty/serial/8250/8250_mid.c

+4 −4
Original line number Diff line number Diff line
@@ -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

include/linux/dma/hsu.h

+4 −5
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ struct hsu_dma_chip { 
/* Export to the internal users */

int hsu_dma_get_status(struct hsu_dma_chip *chip, unsigned short nr,

		       u32 *status);

irqreturn_t hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr,

			   u32 status);

int hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr, u32 status);



/* Export to the platform drivers */

int hsu_dma_probe(struct hsu_dma_chip *chip);
@@ -53,10 +52,10 @@ static inline int hsu_dma_get_status(struct hsu_dma_chip *chip, 
{

	return 0;

}

static inline irqreturn_t hsu_dma_do_irq(struct hsu_dma_chip *chip,

					 unsigned short nr, u32 status)

static inline int hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr,

				 u32 status)

{

	return IRQ_NONE;

	return 0;

}

static inline int hsu_dma_probe(struct hsu_dma_chip *chip) { return -ENODEV; }

static inline int hsu_dma_remove(struct hsu_dma_chip *chip) { return 0; }