[PATCH RFC] spi: spi-davinci: Fix DMA API usage in davinci

[PATCH RFC] spi: spi-davinci: Fix DMA API usage in davinci

[Shubhrajyoti D]

The driver uses NULL for dma_unmap_single instead of
the struct device that the API expects.

Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
---
I do not have the board ,untested.

 drivers/spi/spi-davinci.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 31bfba8..9b2901f 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -653,7 +653,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
 			dev_dbg(sdev, "Couldn't DMA map a %d bytes RX buffer\n",
 								rx_buf_count);
 			if (t->tx_buf)
-				dma_unmap_single(NULL, t->tx_dma, t->len,
+				dma_unmap_single(&spi->dev, t->tx_dma, t->len,
 								DMA_TO_DEVICE);
 			return -ENOMEM;
 		}
@@ -692,10 +692,10 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
 	if (spicfg->io_type == SPI_IO_TYPE_DMA) {
 
 		if (t->tx_buf)
-			dma_unmap_single(NULL, t->tx_dma, t->len,
+			dma_unmap_single(&spi->dev, t->tx_dma, t->len,
 								DMA_TO_DEVICE);
 
-		dma_unmap_single(NULL, t->rx_dma, rx_buf_count,
+		dma_unmap_single(&spi->dev, t->rx_dma, rx_buf_count,
 							DMA_FROM_DEVICE);
 
 		clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN);
-- 
1.7.1


------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure

Re: [PATCH RFC] spi: spi-davinci: Fix DMA API usage in davinci

[Grant Likely]

On Tue, 20 Mar 2012 16:10:09 +0530, Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> wrote:
> The driver uses NULL for dma_unmap_single instead of
> the struct device that the API expects.
> 
> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> ---
> I do not have the board ,untested.

Can someone with this hardware please test?

g.

> 
>  drivers/spi/spi-davinci.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
> index 31bfba8..9b2901f 100644
> --- a/drivers/spi/spi-davinci.c
> +++ b/drivers/spi/spi-davinci.c
> @@ -653,7 +653,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
>  			dev_dbg(sdev, "Couldn't DMA map a %d bytes RX buffer\n",
>  								rx_buf_count);
>  			if (t->tx_buf)
> -				dma_unmap_single(NULL, t->tx_dma, t->len,
> +				dma_unmap_single(&spi->dev, t->tx_dma, t->len,
>  								DMA_TO_DEVICE);
>  			return -ENOMEM;
>  		}
> @@ -692,10 +692,10 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
>  	if (spicfg->io_type == SPI_IO_TYPE_DMA) {
>  
>  		if (t->tx_buf)
> -			dma_unmap_single(NULL, t->tx_dma, t->len,
> +			dma_unmap_single(&spi->dev, t->tx_dma, t->len,
>  								DMA_TO_DEVICE);
>  
> -		dma_unmap_single(NULL, t->rx_dma, rx_buf_count,
> +		dma_unmap_single(&spi->dev, t->rx_dma, rx_buf_count,
>  							DMA_FROM_DEVICE);
>  
>  		clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN);
> -- 
> 1.7.1
> 
> 
> ------------------------------------------------------------------------------
> This SF email is sponsosred by:
> Try Windows Azure free for 90 days Click Here 
> http://p.sf.net/sfu/sfd2d-msazure
> _______________________________________________
> spi-devel-general mailing list
> spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/spi-devel-general

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure

RE: [PATCH RFC] spi: spi-davinci: Fix DMA API usage in davinci

[Nori, Sekhar]

Hi Grant,

On Tue, Mar 20, 2012 at 21:53:34, Grant Likely wrote:
> On Tue, 20 Mar 2012 16:10:09 +0530, Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> wrote:
> > The driver uses NULL for dma_unmap_single instead of
> > the struct device that the API expects.
> > 
> > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> > ---
> > I do not have the board ,untested.
> 
> Can someone with this hardware please test?

Akshay from TI tested this on DA850 EVM. He doesn't have
this e-mail so posting the tested-by on his behalf:

Tested-by: Shankarmurthy, Akshay < akshay.s-l0cyMroinI0@public.gmane.org>

Thanks,
Sekhar

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure

Re: [PATCH RFC] spi: spi-davinci: Fix DMA API usage in davinci

[Shubhrajyoti Datta]

Hi Sekhar,

On Thu, Mar 22, 2012 at 8:08 PM, Nori, Sekhar <nsekhar-l0cyMroinI0@public.gmane.org> wrote:
> Hi Grant,
>
> On Tue, Mar 20, 2012 at 21:53:34, Grant Likely wrote:
>> On Tue, 20 Mar 2012 16:10:09 +0530, Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> wrote:
>> > The driver uses NULL for dma_unmap_single instead of
>> > the struct device that the API expects.
>> >
>> > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
>> > ---
>> > I do not have the board ,untested.
>>
>> Can someone with this hardware please test?
>
> Akshay from TI tested this on DA850 EVM. He doesn't have
> this e-mail so posting the tested-by on his behalf:
>
> Tested-by: Shankarmurthy, Akshay < akshay.s-l0cyMroinI0@public.gmane.org>

Thanks Akshay,

>
> Thanks,
> Sekhar
>
> ------------------------------------------------------------------------------
> This SF email is sponsosred by:
> Try Windows Azure free for 90 days Click Here
> http://p.sf.net/sfu/sfd2d-msazure
> _______________________________________________
> spi-devel-general mailing list
> spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/spi-devel-general

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure

Re: [PATCH RFC] spi: spi-davinci: Fix DMA API usage in davinci

[Grant Likely]

On Thu, 22 Mar 2012 21:31:03 +0530, Shubhrajyoti Datta <omaplinuxkernel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> Hi Sekhar,
> 
> On Thu, Mar 22, 2012 at 8:08 PM, Nori, Sekhar <nsekhar-l0cyMroinI0@public.gmane.org> wrote:
> > Hi Grant,
> >
> > On Tue, Mar 20, 2012 at 21:53:34, Grant Likely wrote:
> >> On Tue, 20 Mar 2012 16:10:09 +0530, Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> wrote:
> >> > The driver uses NULL for dma_unmap_single instead of
> >> > the struct device that the API expects.
> >> >
> >> > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> >> > ---
> >> > I do not have the board ,untested.
> >>
> >> Can someone with this hardware please test?
> >
> > Akshay from TI tested this on DA850 EVM. He doesn't have
> > this e-mail so posting the tested-by on his behalf:
> >
> > Tested-by: Shankarmurthy, Akshay < akshay.s-l0cyMroinI0@public.gmane.org>
> 
> Thanks Akshay,

Applied, thanks.

g.