]> git.baikalelectronics.ru Git - kernel.git/commitdiff
iucv: Convert pr_warning to pr_warn
authorJoe Perches <joe@perches.com>
Wed, 10 Sep 2014 04:17:31 +0000 (21:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Sep 2014 19:40:10 +0000 (12:40 -0700)
Use the more common pr_warn.
Coalesce formats.
Realign arguments.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/iucv/iucv.c

index da787930df0ab643a81bfa1f3f554efb2cd41bee..2a6a1fdd62c059eb857312d10fee38fa1c6bc86f 100644 (file)
@@ -493,8 +493,8 @@ static void iucv_declare_cpu(void *data)
                        err = "Paging or storage error";
                        break;
                }
-               pr_warning("Defining an interrupt buffer on CPU %i"
-                          " failed with 0x%02x (%s)\n", cpu, rc, err);
+               pr_warn("Defining an interrupt buffer on CPU %i failed with 0x%02x (%s)\n",
+                       cpu, rc, err);
                return;
        }
 
@@ -1831,7 +1831,7 @@ static void iucv_external_interrupt(struct ext_code ext_code,
        BUG_ON(p->iptype  < 0x01 || p->iptype > 0x09);
        work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC);
        if (!work) {
-               pr_warning("iucv_external_interrupt: out of memory\n");
+               pr_warn("iucv_external_interrupt: out of memory\n");
                return;
        }
        memcpy(&work->data, p, sizeof(work->data));
@@ -1974,8 +1974,7 @@ static int iucv_pm_restore(struct device *dev)
        printk(KERN_WARNING "iucv_pm_restore %p\n", iucv_path_table);
 #endif
        if ((iucv_pm_state != IUCV_PM_RESTORING) && iucv_path_table)
-               pr_warning("Suspending Linux did not completely close all IUCV "
-                       "connections\n");
+               pr_warn("Suspending Linux did not completely close all IUCV connections\n");
        iucv_pm_state = IUCV_PM_RESTORING;
        if (cpumask_empty(&iucv_irq_cpumask)) {
                rc = iucv_query_maxconn();