aboutsummaryrefslogtreecommitdiffstats
path: root/net/iucv/iucv.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-09-10 00:17:31 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-10 15:40:10 -0400
commit47c4cfc37fb71e0fa801a4ed9228de83404abfce (patch)
treefee3b39554be256e3cef94b5f51f29787482cfa4 /net/iucv/iucv.c
parent294a0b7f3148e2a4e916965a6d14838e08143ba8 (diff)
iucv: Convert pr_warning to pr_warn
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>
Diffstat (limited to 'net/iucv/iucv.c')
-rw-r--r--net/iucv/iucv.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index da787930df0a..2a6a1fdd62c0 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -493,8 +493,8 @@ static void iucv_declare_cpu(void *data)
493 err = "Paging or storage error"; 493 err = "Paging or storage error";
494 break; 494 break;
495 } 495 }
496 pr_warning("Defining an interrupt buffer on CPU %i" 496 pr_warn("Defining an interrupt buffer on CPU %i failed with 0x%02x (%s)\n",
497 " failed with 0x%02x (%s)\n", cpu, rc, err); 497 cpu, rc, err);
498 return; 498 return;
499 } 499 }
500 500
@@ -1831,7 +1831,7 @@ static void iucv_external_interrupt(struct ext_code ext_code,
1831 BUG_ON(p->iptype < 0x01 || p->iptype > 0x09); 1831 BUG_ON(p->iptype < 0x01 || p->iptype > 0x09);
1832 work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC); 1832 work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC);
1833 if (!work) { 1833 if (!work) {
1834 pr_warning("iucv_external_interrupt: out of memory\n"); 1834 pr_warn("iucv_external_interrupt: out of memory\n");
1835 return; 1835 return;
1836 } 1836 }
1837 memcpy(&work->data, p, sizeof(work->data)); 1837 memcpy(&work->data, p, sizeof(work->data));
@@ -1974,8 +1974,7 @@ static int iucv_pm_restore(struct device *dev)
1974 printk(KERN_WARNING "iucv_pm_restore %p\n", iucv_path_table); 1974 printk(KERN_WARNING "iucv_pm_restore %p\n", iucv_path_table);
1975#endif 1975#endif
1976 if ((iucv_pm_state != IUCV_PM_RESTORING) && iucv_path_table) 1976 if ((iucv_pm_state != IUCV_PM_RESTORING) && iucv_path_table)
1977 pr_warning("Suspending Linux did not completely close all IUCV " 1977 pr_warn("Suspending Linux did not completely close all IUCV connections\n");
1978 "connections\n");
1979 iucv_pm_state = IUCV_PM_RESTORING; 1978 iucv_pm_state = IUCV_PM_RESTORING;
1980 if (cpumask_empty(&iucv_irq_cpumask)) { 1979 if (cpumask_empty(&iucv_irq_cpumask)) {
1981 rc = iucv_query_maxconn(); 1980 rc = iucv_query_maxconn();