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

Commit 823cd045 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Mark Brown
Browse files

spi/spi-atmel: status information passed through controller data 



The status of transfer is stored in controller data structure
so that it can be used not only by atmel_spi_msg_done() function.
This will be useful for upcoming dmaengine enabled driver.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 1888e8f2

drivers/spi/spi-atmel.c

+8 −5
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ struct atmel_spi { 
	unsigned long		current_remaining_bytes;

	struct spi_transfer	*next_transfer;

	unsigned long		next_remaining_bytes;

	int			done_status;



	void			*buffer;

	dma_addr_t		buffer_dma;
@@ -553,15 +554,15 @@ static void atmel_spi_dma_unmap_xfer(struct spi_master *master, 


static void

atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as,

		struct spi_message *msg, int status, int stay)

		struct spi_message *msg, int stay)

{

	if (!stay || status < 0)

	if (!stay || as->done_status < 0)

		cs_deactivate(as, msg->spi);

	else

		as->stay = msg->spi;



	list_del(&msg->queue);

	msg->status = status;

	msg->status = as->done_status;



	dev_dbg(master->dev.parent,

		"xfer complete: %u bytes transferred\n",
@@ -573,6 +574,7 @@ atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as, 


	as->current_transfer = NULL;

	as->next_transfer = NULL;

	as->done_status = 0;



	/* continue if needed */

	if (list_empty(&as->queue) || as->stopping)
@@ -650,7 +652,8 @@ atmel_spi_interrupt(int irq, void *dev_id) 
		/* Clear any overrun happening while cleaning up */

		spi_readl(as, SR);



		atmel_spi_msg_done(master, as, msg, -EIO, 0);

		as->done_status = -EIO;

		atmel_spi_msg_done(master, as, msg, 0);

	} else if (pending & (SPI_BIT(RXBUFF) | SPI_BIT(ENDRX))) {

		ret = IRQ_HANDLED;
@@ -668,7 +671,7 @@ atmel_spi_interrupt(int irq, void *dev_id) 


			if (atmel_spi_xfer_is_last(msg, xfer)) {

				/* report completed message */

				atmel_spi_msg_done(master, as, msg, 0,

				atmel_spi_msg_done(master, as, msg,

						xfer->cs_change);

			} else {

				if (xfer->cs_change) {