diff mbox

ARM: dma-mapping: add in missing white space in error message text

Message ID 20160912125212.32739-1-colin.king@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

Colin King Sept. 12, 2016, 12:52 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

A dev_warn message spans two lines and the literal string is missing
a white space between words. Add the white space.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arch/arm/common/dmabounce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Robin Murphy Sept. 12, 2016, 1:06 p.m. UTC | #1
On 12/09/16 13:52, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> A dev_warn message spans two lines and the literal string is missing
> a white space between words. Add the white space.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  arch/arm/common/dmabounce.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
> index 3012816..f47767b 100644
> --- a/arch/arm/common/dmabounce.c
> +++ b/arch/arm/common/dmabounce.c
> @@ -547,7 +547,7 @@ void dmabounce_unregister_dev(struct device *dev)
>  
>  	if (!device_info) {
>  		dev_warn(dev,
> -			 "Never registered with dmabounce but attempting"
> +			 "Never registered with dmabounce but attempting "
>  			 "to unregister!\n");

Per Documentation/CodingStyle, better to put the whole thing onto one
line so that, say, "git grep 'attempting to unregister'" doesn't leave
one scratching ones head in confusion.

Of course, even better would be to get rid of the whole thing and
convert ARM to use SWIOTLB, but hey, one thing at a time ;)

Robin.

>  		return;
>  	}
>
Russell King (Oracle) Sept. 12, 2016, 2:33 p.m. UTC | #2
On Mon, Sep 12, 2016 at 02:06:09PM +0100, Robin Murphy wrote:
> On 12/09/16 13:52, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> > 
> > A dev_warn message spans two lines and the literal string is missing
> > a white space between words. Add the white space.
> > 
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > ---
> >  arch/arm/common/dmabounce.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
> > index 3012816..f47767b 100644
> > --- a/arch/arm/common/dmabounce.c
> > +++ b/arch/arm/common/dmabounce.c
> > @@ -547,7 +547,7 @@ void dmabounce_unregister_dev(struct device *dev)
> >  
> >  	if (!device_info) {
> >  		dev_warn(dev,
> > -			 "Never registered with dmabounce but attempting"
> > +			 "Never registered with dmabounce but attempting "
> >  			 "to unregister!\n");
> 
> Per Documentation/CodingStyle, better to put the whole thing onto one
> line so that, say, "git grep 'attempting to unregister'" doesn't leave
> one scratching ones head in confusion.
> 
> Of course, even better would be to get rid of the whole thing and
> convert ARM to use SWIOTLB, but hey, one thing at a time ;)

I doubt that can happen - dmabounce does a little more than swiotlb
because it copes with DMA masks that are _not_ a number of zeros
followed by one bits.  It was written to support things like SA1111
DMA, where the device has a bug in that it can't drive certain
SDRAM address bits correctly.

It also gets used for ITE8512 PCI controllers and IXP4xx platforms,
although these should probably be converted to SWIOTLB.  However,
without having test systems, I'd recommend leaving them as-is.
Colin King Sept. 12, 2016, 2:52 p.m. UTC | #3
On 12/09/16 15:33, Russell King - ARM Linux wrote:
> On Mon, Sep 12, 2016 at 02:06:09PM +0100, Robin Murphy wrote:
>> On 12/09/16 13:52, Colin King wrote:
>>> From: Colin Ian King <colin.king@canonical.com>
>>>
>>> A dev_warn message spans two lines and the literal string is missing
>>> a white space between words. Add the white space.
>>>
>>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>>> ---
>>>  arch/arm/common/dmabounce.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
>>> index 3012816..f47767b 100644
>>> --- a/arch/arm/common/dmabounce.c
>>> +++ b/arch/arm/common/dmabounce.c
>>> @@ -547,7 +547,7 @@ void dmabounce_unregister_dev(struct device *dev)
>>>  
>>>  	if (!device_info) {
>>>  		dev_warn(dev,
>>> -			 "Never registered with dmabounce but attempting"
>>> +			 "Never registered with dmabounce but attempting "
>>>  			 "to unregister!\n");
>>
>> Per Documentation/CodingStyle, better to put the whole thing onto one
>> line so that, say, "git grep 'attempting to unregister'" doesn't leave
>> one scratching ones head in confusion.
>>
>> Of course, even better would be to get rid of the whole thing and
>> convert ARM to use SWIOTLB, but hey, one thing at a time ;)
> 
> I doubt that can happen - dmabounce does a little more than swiotlb
> because it copes with DMA masks that are _not_ a number of zeros
> followed by one bits.  It was written to support things like SA1111
> DMA, where the device has a bug in that it can't drive certain
> SDRAM address bits correctly.
> 
> It also gets used for ITE8512 PCI controllers and IXP4xx platforms,
> although these should probably be converted to SWIOTLB.  However,
> without having test systems, I'd recommend leaving them as-is.
> 
OK, nevermind this patch, drop it into /dev/null

Colin
diff mbox

Patch

diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index 3012816..f47767b 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -547,7 +547,7 @@  void dmabounce_unregister_dev(struct device *dev)
 
 	if (!device_info) {
 		dev_warn(dev,
-			 "Never registered with dmabounce but attempting"
+			 "Never registered with dmabounce but attempting "
 			 "to unregister!\n");
 		return;
 	}