sh: Use pr_warn instead of pr_warning

As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent <prefix>_warn style. Let's do it.

Link: http://lkml.kernel.org/r/20191018031850.48498-5-wangkefeng.wang@huawei.com
To: linux-kernel@vger.kernel.org
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>

diff --git a/arch/sh/boards/mach-sdk7786/nmi.c b/arch/sh/boards/mach-sdk7786/nmi.c
index c2e09d798537c4468d7099b1a7635fecb860cccb..afba49679a1219dcec782c1364484851c9acf513 100644 (file)
--- a/arch/sh/boards/mach-sdk7786/nmi.c
+++ b/arch/sh/boards/mach-sdk7786/nmi.c
@@ -37,7 +37,7 @@ static int __init nmi_mode_setup(char *str)
                nmi_mode = NMI_MODE_ANY;
        else {
                nmi_mode = NMI_MODE_UNKNOWN;
-               pr_warning("Unknown NMI mode %s\n", str);
+               pr_warn("Unknown NMI mode %s\n", str);
        }
 
        printk("Set NMI mode to %d\n", nmi_mode);

diff --git a/arch/sh/drivers/pci/fixups-sdk7786.c b/arch/sh/drivers/pci/fixups-sdk7786.c
index 8cbfa5310a4b227b1c0a776b0b8621f003cf0d7f..6972af7b4e93d56a29e4f610e7020bf84ba020e4 100644 (file)
--- a/arch/sh/drivers/pci/fixups-sdk7786.c
+++ b/arch/sh/drivers/pci/fixups-sdk7786.c
@@ -53,7 +53,7 @@ static int __init sdk7786_pci_init(void)
 
                /* Warn about forced rerouting if slot#3 is occupied */
                if ((data & PCIECR_PRST3) == 0) {
-                       pr_warning("Unreachable card detected in slot#3\n");
+                       pr_warn("Unreachable card detected in slot#3\n");
                        return -EBUSY;
                }
        } else

diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index bacad6da4fe4f04c44584ee414a2d75ba336381e..60c828a2b8a2c1ca06570bac89791a36512d7ca2 100644 (file)
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -99,7 +99,7 @@ int register_trapped_io(struct trapped_io *tiop)
 
        return 0;
  bad:
-       pr_warning("unable to install trapped io filter\n");
+       pr_warn("unable to install trapped io filter\n");
        return -1;
 }
 EXPORT_SYMBOL_GPL(register_trapped_io);

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 2c0e0f37a318d3ad6f2628df398bb5d1c54f5f72..6ef341f6cfee9ce1aa91349b9f54a5d4f555204e 100644 (file)
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -354,7 +354,7 @@ void __init setup_arch(char **cmdline_p)
 /* processor boot mode configuration */
 int generic_mode_pins(void)
 {
-       pr_warning("generic_mode_pins(): missing mode pin configuration\n");
+       pr_warn("generic_mode_pins(): missing mode pin configuration\n");
        return 0;
 }
 

diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index 792f3612906233c2fba2741af66ff85dc6a45f7c..3169a343a5abe57757267fbe690617c6b9e52da6 100644 (file)
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -43,8 +43,7 @@ int __init platform_resource_setup_memory(struct platform_device *pdev,
 
        r = pdev->resource + pdev->num_resources - 1;
        if (r->flags) {
-               pr_warning("%s: unable to find empty space for resource\n",
-                       name);
+               pr_warn("%s: unable to find empty space for resource\n", name);
                return -EINVAL;
        }
 
@@ -54,7 +53,7 @@ int __init platform_resource_setup_memory(struct platform_device *pdev,
 
        buf = dma_alloc_coherent(&pdev->dev, memsize, &dma_handle, GFP_KERNEL);
        if (!buf) {
-               pr_warning("%s: unable to allocate memory\n", name);
+               pr_warn("%s: unable to allocate memory\n", name);
                return -ENOMEM;
        }