Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / tile / kernel / machine_kexec.c

diff --git a/arch/tile/kernel/machine_kexec.c b/arch/tile/kernel/machine_kexec.c
index f0b54a9..008aa2f 100644 (file)
--- a/arch/tile/kernel/machine_kexec.c
+++ b/arch/tile/kernel/machine_kexec.c
@@ -77,16 +77,13 @@ void machine_crash_shutdown(struct pt_regs *regs)
 int machine_kexec_prepare(struct kimage *image)
 {
        if (num_online_cpus() > 1) {
-               pr_warning("%s: detected attempt to kexec "
-                      "with num_online_cpus() > 1\n",
-                      __func__);
+               pr_warn("%s: detected attempt to kexec with num_online_cpus() > 1\n",
+                       __func__);
                return -ENOSYS;
        }
        if (image->type != KEXEC_TYPE_DEFAULT) {
-               pr_warning("%s: detected attempt to kexec "
-                      "with unsupported type: %d\n",
-                      __func__,
-                      image->type);
+               pr_warn("%s: detected attempt to kexec with unsupported type: %d\n",
+                       __func__, image->type);
                return -ENOSYS;
        }
        return 0;
@@ -131,8 +128,8 @@ static unsigned char *kexec_bn2cl(void *pg)
         */
        csum = ip_compute_csum(pg, bhdrp->b_size);
        if (csum != 0) {
-               pr_warning("%s: bad checksum %#x (size %d)\n",
-                          __func__, csum, bhdrp->b_size);
+               pr_warn("%s: bad checksum %#x (size %d)\n",
+                       __func__, csum, bhdrp->b_size);
                return 0;
        }
 
@@ -160,8 +157,7 @@ static unsigned char *kexec_bn2cl(void *pg)
        while (*desc != '\0') {
                desc++;
                if (((unsigned long)desc & PAGE_MASK) != (unsigned long)pg) {
-                       pr_info("%s: ran off end of page\n",
-                              __func__);
+                       pr_info("%s: ran off end of page\n", __func__);
                        return 0;
                }
        }
@@ -195,20 +191,18 @@ static void kexec_find_and_set_command_line(struct kimage *image)
        }
 
        if (command_line != 0) {
-               pr_info("setting new command line to \"%s\"\n",
-                      command_line);
+               pr_info("setting new command line to \"%s\"\n", command_line);
 
                hverr = hv_set_command_line(
                        (HV_VirtAddr) command_line, strlen(command_line));
                kunmap_atomic(command_line);
        } else {
-               pr_info("%s: no command line found; making empty\n",
-                      __func__);
+               pr_info("%s: no command line found; making empty\n", __func__);
                hverr = hv_set_command_line((HV_VirtAddr) command_line, 0);
        }
        if (hverr)
-               pr_warning("%s: hv_set_command_line returned error: %d\n",
-                          __func__, hverr);
+               pr_warn("%s: hv_set_command_line returned error: %d\n",
+                       __func__, hverr);
 }
 
 /*