On Tue, 6 May 2014 19:07:34 +0200 Fabian Frederick <f...@skynet.be> wrote:

> +coalesce formats
> 
> (This is untested)
> 
> Cc: Guan Xuetao <g...@mprc.pku.edu.cn>
> Cc: Andrew Morton <a...@linux-foundation.org>
> Signed-off-by: Fabian Frederick <f...@skynet.be>
> ---
>  arch/unicore32/mm/ioremap.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/unicore32/mm/ioremap.c b/arch/unicore32/mm/ioremap.c
> index 13068ee..5d9568c 100644
> --- a/arch/unicore32/mm/ioremap.c
> +++ b/arch/unicore32/mm/ioremap.c
> @@ -143,13 +143,8 @@ void __iomem *__uc32_ioremap_pfn_caller(unsigned long 
> pfn,
>       /*
>        * Don't allow RAM to be mapped
>        */
> -     if (pfn_valid(pfn)) {
> -             printk(KERN_WARNING "BUG: Your driver calls ioremap() on\n"
> -                     "system memory.  This leads to architecturally\n"
> -                     "unpredictable behaviour, and ioremap() will fail in\n"
> -                     "the next kernel release. Please fix your driver.\n");
> -             WARN_ON(1);
> -     }
> +     if (pfn_valid(pfn))
> +             WARN(1, "BUG: Your driver calls ioremap() on\nsystem memory.  
> This leads to architecturally\nunpredictable behaviour, and ioremap() will 
> fail in\nthe next kernel release. Please fix your driver.\n");
>  

I don't think that was an improvement.  Particularly with all
those \n's in there.

checkpatch is a just a guide.  It can and should be overruled by common
sense and taste.

--- 
a/arch/unicore32/mm/ioremap.c~arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1-fix
+++ a/arch/unicore32/mm/ioremap.c
@@ -144,7 +144,10 @@ void __iomem *__uc32_ioremap_pfn_caller(
         * Don't allow RAM to be mapped
         */
        if (pfn_valid(pfn))
-               WARN(1, "BUG: Your driver calls ioremap() on\nsystem memory.  
This leads to architecturally\nunpredictable behaviour, and ioremap() will fail 
in\nthe next kernel release. Please fix your driver.\n");
+               WARN(1, "BUG: Your driver calls ioremap() on\n"
+                       "system memory.  This leads to architecturally\n"
+                       "unpredictable behaviour, and ioremap() will fail in\n"
+                       "the next kernel release. Please fix your driver.\n");
 
        type = get_mem_type(mtype);
        if (!type)
_

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to