* [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy
@ 2011-03-01 10:32 Per Forlin
2011-03-03 0:42 ` Koul, Vinod
0 siblings, 1 reply; 4+ messages in thread
From: Per Forlin @ 2011-03-01 10:32 UTC (permalink / raw)
To: Dan Williams; +Cc: linux-kernel, Per Forlin
From: Per Forlin <per.forlin@linaro.org>
Signed-off-by: Per Forlin <per.forlin@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy
2011-03-01 10:32 [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy Per Forlin
@ 2011-03-03 0:42 ` Koul, Vinod
2011-03-11 22:52 ` Dan Williams
0 siblings, 1 reply; 4+ messages in thread
From: Koul, Vinod @ 2011-03-03 0:42 UTC (permalink / raw)
To: Per Forlin; +Cc: Dan Williams, linux-kernel, Per Forlin
On Tue, 2011-03-01 at 11:32 +0100, Per Forlin wrote:
> From: Per Forlin <per.forlin@linaro.org>
>
> Signed-off-by: Per Forlin <per.forlin@linaro.org>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy
2011-03-03 0:42 ` Koul, Vinod
@ 2011-03-11 22:52 ` Dan Williams
2011-03-13 20:20 ` Per Forlin
0 siblings, 1 reply; 4+ messages in thread
From: Dan Williams @ 2011-03-11 22:52 UTC (permalink / raw)
To: Per Forlin, Linus Walleij; +Cc: Per Forlin, linux-kernel, Koul, Vinod
On Wed, Mar 2, 2011 at 4:42 PM, Koul, Vinod <vinod.koul@intel.com> wrote:
> On Tue, 2011-03-01 at 11:32 +0100, Per Forlin wrote:
>> From: Per Forlin <per.forlin@linaro.org>
>>
>> Signed-off-by: Per Forlin <per.forlin@linaro.org>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>> ---
>> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy
2011-03-11 22:52 ` Dan Williams
@ 2011-03-13 20:20 ` Per Forlin
0 siblings, 0 replies; 4+ messages in thread
From: Per Forlin @ 2011-03-13 20:20 UTC (permalink / raw)
To: Dan Williams; +Cc: Linus Walleij, Per Forlin, linux-kernel, Koul, Vinod
On 11 March 2011 23:52, Dan Williams <dan.j.williams@intel.com> wrote:
> On Wed, Mar 2, 2011 at 4:42 PM, Koul, Vinod <vinod.koul@intel.com> wrote:
>> On Tue, 2011-03-01 at 11:32 +0100, Per Forlin wrote:
>>> From: Per Forlin <per.forlin@linaro.org>
>>>
>>> Signed-off-by: Per Forlin <per.forlin@linaro.org>
>>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>>> ---
>>> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-13 20:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-01 10:32 [PATCH] ste_dma40: assign device_prep_dma_sg for dma_memcpy Per Forlin
2011-03-03 0:42 ` Koul, Vinod
2011-03-11 22:52 ` Dan Williams
2011-03-13 20:20 ` Per Forlin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®