[PATCH] Documentation/DMA-API-HOWTO.txt: fix duplicated word

[PATCH] Documentation/DMA-API-HOWTO.txt: fix duplicated word

[Emilio López]

"coherent" is written twice when it should be just once

Signed-off-by: Emilio López <emilio@elopez.com.ar>
---

The sentence still doesn't sound entirely correct in my head, maybe 
someone can propose a better rewording.

 Documentation/DMA-API-HOWTO.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt
index 5e98303..4ede25a 100644
--- a/Documentation/DMA-API-HOWTO.txt
+++ b/Documentation/DMA-API-HOWTO.txt
@@ -192,7 +192,7 @@ the case would look like this:
 		goto ignore_this_device;
 	}
 
-The coherent coherent mask will always be able to set the same or a
+The coherent mask will always be able to set the same or a
 smaller mask as the streaming mask. However for the rare case that a
 device driver only uses consistent allocations, one would have to
 check the return value from dma_set_coherent_mask().
-- 
1.9.2

Re: [PATCH] Documentation/DMA-API-HOWTO.txt: fix duplicated word

[Bjorn Helgaas]

On Sun, May 11, 2014 at 2:15 PM, Emilio López <emilio@elopez.com.ar> wrote:
> "coherent" is written twice when it should be just once
>
> Signed-off-by: Emilio López <emilio@elopez.com.ar>
> ---
>
> The sentence still doesn't sound entirely correct in my head, maybe
> someone can propose a better rewording.

I added this patch to my series.  I agree the wording is awkward, but
I don't have a better proposal right now.

>  Documentation/DMA-API-HOWTO.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt
> index 5e98303..4ede25a 100644
> --- a/Documentation/DMA-API-HOWTO.txt
> +++ b/Documentation/DMA-API-HOWTO.txt
> @@ -192,7 +192,7 @@ the case would look like this:
>                 goto ignore_this_device;
>         }
>
> -The coherent coherent mask will always be able to set the same or a
> +The coherent mask will always be able to set the same or a
>  smaller mask as the streaming mask. However for the rare case that a
>  device driver only uses consistent allocations, one would have to
>  check the return value from dma_set_coherent_mask().
> --
> 1.9.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Documentation/DMA-API-HOWTO.txt: fix duplicated word

[Randy Dunlap]

On 05/12/2014 06:14 AM, Bjorn Helgaas wrote:
> On Sun, May 11, 2014 at 2:15 PM, Emilio López <emilio@elopez.com.ar> wrote:
>> "coherent" is written twice when it should be just once
>>
>> Signed-off-by: Emilio López <emilio@elopez.com.ar>
>> ---
>>
>> The sentence still doesn't sound entirely correct in my head, maybe
>> someone can propose a better rewording.
> 
> I added this patch to my series.  I agree the wording is awkward, but
> I don't have a better proposal right now.

Thanks.

I have reviewed your patch series documentation changes.  The only other
change that I would make (can be done at some other time) is to refer to
CPU instead of cpu, so your patches 1 and 2 are also
Acked-by: Randy Dunlap <rdunlap@infradead.org>


You can send the merge request for all of these to Linus
if you want to...

Would you also please pick up these 2 new patches from today?
(or comment on them/correct them)

From: "gioh.kim" <gioh.kim@lge.com>
[PATCH] Documentation/DMA-API-HOWTO.txt: update API descriptions
[PATCH] Documentation/dma-buf-sharing.txt: update API descriptions





> 
>>  Documentation/DMA-API-HOWTO.txt | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt
>> index 5e98303..4ede25a 100644
>> --- a/Documentation/DMA-API-HOWTO.txt
>> +++ b/Documentation/DMA-API-HOWTO.txt
>> @@ -192,7 +192,7 @@ the case would look like this:
>>                 goto ignore_this_device;
>>         }
>>
>> -The coherent coherent mask will always be able to set the same or a
>> +The coherent mask will always be able to set the same or a
>>  smaller mask as the streaming mask. However for the rare case that a
>>  device driver only uses consistent allocations, one would have to
>>  check the return value from dma_set_coherent_mask().
>> --


-- 
~Randy

Re: [PATCH] Documentation/DMA-API-HOWTO.txt: fix duplicated word

[Bjorn Helgaas]

On Mon, May 12, 2014 at 11:12 AM, Randy Dunlap <rdunlap@infradead.org> wrote:
> On 05/12/2014 06:14 AM, Bjorn Helgaas wrote:
>> On Sun, May 11, 2014 at 2:15 PM, Emilio López <emilio@elopez.com.ar> wrote:
>>> "coherent" is written twice when it should be just once
>>>
>>> Signed-off-by: Emilio López <emilio@elopez.com.ar>
>>> ---
>>>
>>> The sentence still doesn't sound entirely correct in my head, maybe
>>> someone can propose a better rewording.
>>
>> I added this patch to my series.  I agree the wording is awkward, but
>> I don't have a better proposal right now.
>
> Thanks.
>
> I have reviewed your patch series documentation changes.  The only other
> change that I would make (can be done at some other time) is to refer to
> CPU instead of cpu, so your patches 1 and 2 are also
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
>
>
> You can send the merge request for all of these to Linus
> if you want to...
>
> Would you also please pick up these 2 new patches from today?
> (or comment on them/correct them)
>
> From: "gioh.kim" <gioh.kim@lge.com>
> [PATCH] Documentation/DMA-API-HOWTO.txt: update API descriptions
> [PATCH] Documentation/dma-buf-sharing.txt: update API descriptions

I added your acks and added these two patches and will ask Linus to
pull the whole shebang for v3.16.  Thanks!

>>>  Documentation/DMA-API-HOWTO.txt | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt
>>> index 5e98303..4ede25a 100644
>>> --- a/Documentation/DMA-API-HOWTO.txt
>>> +++ b/Documentation/DMA-API-HOWTO.txt
>>> @@ -192,7 +192,7 @@ the case would look like this:
>>>                 goto ignore_this_device;
>>>         }
>>>
>>> -The coherent coherent mask will always be able to set the same or a
>>> +The coherent mask will always be able to set the same or a
>>>  smaller mask as the streaming mask. However for the rare case that a
>>>  device driver only uses consistent allocations, one would have to
>>>  check the return value from dma_set_coherent_mask().
>>> --
>
>
> --
> ~Randy