2011-03-01 10:34:18

by Per Förlin

Subject: [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy

From: Per Forlin <[email protected]>

Signed-off-by: Per Forlin <[email protected]>
Acked-by: Linus Walleij <[email protected]>
---
drivers/dma/ste_dma40.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 6e1d46a..1dd8ea3 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2496,7 +2496,7 @@ static int __init d40_dmaengine_init(struct d40_base *base,
base->dma_memcpy.device_alloc_chan_resources = d40_alloc_chan_resources;
base->dma_memcpy.device_free_chan_resources = d40_free_chan_resources;
base->dma_memcpy.device_prep_dma_memcpy = d40_prep_memcpy;
- base->dma_slave.device_prep_dma_sg = d40_prep_sg;
+ base->dma_memcpy.device_prep_dma_sg = d40_prep_sg;
base->dma_memcpy.device_prep_slave_sg = d40_prep_slave_sg;
base->dma_memcpy.device_tx_status = d40_tx_status;
base->dma_memcpy.device_issue_pending = d40_issue_pending;
--
1.6.3.3

2011-03-03 01:09:30

by Vinod Koul

Subject: Re: [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy

On Tue, 2011-03-01 at 11:32 +0100, Per Forlin wrote:
> From: Per Forlin <[email protected]>
>
> Signed-off-by: Per Forlin <[email protected]>
> Acked-by: Linus Walleij <[email protected]>
> ---
> drivers/dma/ste_dma40.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
> index 6e1d46a..1dd8ea3 100644
> --- a/drivers/dma/ste_dma40.c
> +++ b/drivers/dma/ste_dma40.c
> @@ -2496,7 +2496,7 @@ static int __init d40_dmaengine_init(struct d40_base *base,
> base->dma_memcpy.device_alloc_chan_resources = d40_alloc_chan_resources;
> base->dma_memcpy.device_free_chan_resources = d40_free_chan_resources;
> base->dma_memcpy.device_prep_dma_memcpy = d40_prep_memcpy;
> - base->dma_slave.device_prep_dma_sg = d40_prep_sg;
> + base->dma_memcpy.device_prep_dma_sg = d40_prep_sg;
> base->dma_memcpy.device_prep_slave_sg = d40_prep_slave_sg;
> base->dma_memcpy.device_tx_status = d40_tx_status;
> base->dma_memcpy.device_issue_pending = d40_issue_pending;

Please copy the MAINTAINERS, or your patches can get missed...

Applied, Thanks

~Vinod




--
~Vinod

2011-03-11 22:52:51

by Dan Williams

Subject: Re: [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy

On Wed, Mar 2, 2011 at 4:42 PM, Koul, Vinod <[email protected]> wrote:
> On Tue, 2011-03-01 at 11:32 +0100, Per Forlin wrote:
>> From: Per Forlin <[email protected]>
>>
>> Signed-off-by: Per Forlin <[email protected]>
>> Acked-by: Linus Walleij <[email protected]>
>> ---
>> ?drivers/dma/ste_dma40.c | ? ?2 +-
>> ?1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
>> index 6e1d46a..1dd8ea3 100644
>> --- a/drivers/dma/ste_dma40.c
>> +++ b/drivers/dma/ste_dma40.c
>> @@ -2496,7 +2496,7 @@ static int __init d40_dmaengine_init(struct d40_base *base,
>> ? ? ? base->dma_memcpy.device_alloc_chan_resources = d40_alloc_chan_resources;
>> ? ? ? base->dma_memcpy.device_free_chan_resources = d40_free_chan_resources;
>> ? ? ? base->dma_memcpy.device_prep_dma_memcpy = d40_prep_memcpy;
>> - ? ? base->dma_slave.device_prep_dma_sg = d40_prep_sg;
>> + ? ? base->dma_memcpy.device_prep_dma_sg = d40_prep_sg;
>> ? ? ? base->dma_memcpy.device_prep_slave_sg = d40_prep_slave_sg;
>> ? ? ? base->dma_memcpy.device_tx_status = d40_tx_status;
>> ? ? ? base->dma_memcpy.device_issue_pending = d40_issue_pending;
>
> Please copy the MAINTAINERS, or your patches can get missed...
>
> Applied, Thanks
>

While preparing the 2.6.39 tree this patch no longer applies, it looks
like it is not needed after the pending conversion patches from Rabin.
Ok to drop, or was this urgent for 2.6.38-final? If the latter the
changelog did not indicate.

--
Dan

2011-03-13 20:20:43

by Per Forlin

Subject: Re: [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy

On 11 March 2011 23:52, Dan Williams <[email protected]> wrote:
> On Wed, Mar 2, 2011 at 4:42 PM, Koul, Vinod <[email protected]> wrote:
>> On Tue, 2011-03-01 at 11:32 +0100, Per Forlin wrote:
>>> From: Per Forlin <[email protected]>
>>>
>>> Signed-off-by: Per Forlin <[email protected]>
>>> Acked-by: Linus Walleij <[email protected]>
>>> ---
>>> ?drivers/dma/ste_dma40.c | ? ?2 +-
>>> ?1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
>>> index 6e1d46a..1dd8ea3 100644
>>> --- a/drivers/dma/ste_dma40.c
>>> +++ b/drivers/dma/ste_dma40.c
>>> @@ -2496,7 +2496,7 @@ static int __init d40_dmaengine_init(struct d40_base *base,
>>> ? ? ? base->dma_memcpy.device_alloc_chan_resources = d40_alloc_chan_resources;
>>> ? ? ? base->dma_memcpy.device_free_chan_resources = d40_free_chan_resources;
>>> ? ? ? base->dma_memcpy.device_prep_dma_memcpy = d40_prep_memcpy;
>>> - ? ? base->dma_slave.device_prep_dma_sg = d40_prep_sg;
>>> + ? ? base->dma_memcpy.device_prep_dma_sg = d40_prep_sg;
>>> ? ? ? base->dma_memcpy.device_prep_slave_sg = d40_prep_slave_sg;
>>> ? ? ? base->dma_memcpy.device_tx_status = d40_tx_status;
>>> ? ? ? base->dma_memcpy.device_issue_pending = d40_issue_pending;
>>
>> Please copy the MAINTAINERS, or your patches can get missed...
>>
>> Applied, Thanks
>>
>
> While preparing the 2.6.39 tree this patch no longer applies, it looks
> like it is not needed after the pending conversion patches from Rabin.
> ?Ok to drop, or was this urgent for 2.6.38-final? ?If the latter the
> changelog did not indicate.
It is not urgent for 2.6.38-final, please drop it.

Thanks
Per