aboutsummaryrefslogtreecommitdiffstats
path: root/net/iucv
diff options
context:
space:
mode:
authorUrsula Braun <braunu@de.ibm.com>2008-07-14 03:59:29 -0400
committerHeiko Carstens <heiko.carstens@de.ibm.com>2008-07-14 04:02:20 -0400
commitc2b4afd2f99a187ec3bbd6e2def186fbfb755929 (patch)
treec7f8504d531b1bbcb9476b1edd24573467eaf1c1 /net/iucv
parenta12c53f4fa759b59654b6d5f21eb4070cd45cd54 (diff)
[S390] Cleanup iucv printk messages.
Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'net/iucv')
-rw-r--r--net/iucv/af_iucv.c8
-rw-r--r--net/iucv/iucv.c9
2 files changed, 4 insertions, 13 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 7b0038f45b1..bda71015885 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1135,8 +1135,7 @@ static void iucv_callback_txdone(struct iucv_path *path,
1135 if (this) 1135 if (this)
1136 kfree_skb(this); 1136 kfree_skb(this);
1137 } 1137 }
1138 if (!this) 1138 BUG_ON(!this);
1139 printk(KERN_ERR "AF_IUCV msg tag %u not found\n", msg->tag);
1140 1139
1141 if (sk->sk_state == IUCV_CLOSING) { 1140 if (sk->sk_state == IUCV_CLOSING) {
1142 if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) { 1141 if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) {
@@ -1196,7 +1195,7 @@ static int __init afiucv_init(void)
1196 } 1195 }
1197 cpcmd("QUERY USERID", iucv_userid, sizeof(iucv_userid), &err); 1196 cpcmd("QUERY USERID", iucv_userid, sizeof(iucv_userid), &err);
1198 if (unlikely(err)) { 1197 if (unlikely(err)) {
1199 printk(KERN_ERR "AF_IUCV needs the VM userid\n"); 1198 WARN_ON(err);
1200 err = -EPROTONOSUPPORT; 1199 err = -EPROTONOSUPPORT;
1201 goto out; 1200 goto out;
1202 } 1201 }
@@ -1210,7 +1209,6 @@ static int __init afiucv_init(void)
1210 err = sock_register(&iucv_sock_family_ops); 1209 err = sock_register(&iucv_sock_family_ops);
1211 if (err) 1210 if (err)
1212 goto out_proto; 1211 goto out_proto;
1213 printk(KERN_INFO "AF_IUCV lowlevel driver initialized\n");
1214 return 0; 1212 return 0;
1215 1213
1216out_proto: 1214out_proto:
@@ -1226,8 +1224,6 @@ static void __exit afiucv_exit(void)
1226 sock_unregister(PF_IUCV); 1224 sock_unregister(PF_IUCV);
1227 proto_unregister(&iucv_proto); 1225 proto_unregister(&iucv_proto);
1228 iucv_unregister(&af_iucv_handler, 0); 1226 iucv_unregister(&af_iucv_handler, 0);
1229
1230 printk(KERN_INFO "AF_IUCV lowlevel driver unloaded\n");
1231} 1227}
1232 1228
1233module_init(afiucv_init); 1229module_init(afiucv_init);
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 91897076213..7f82b761621 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -1559,16 +1559,11 @@ static void iucv_external_interrupt(u16 code)
1559 1559
1560 p = iucv_irq_data[smp_processor_id()]; 1560 p = iucv_irq_data[smp_processor_id()];
1561 if (p->ippathid >= iucv_max_pathid) { 1561 if (p->ippathid >= iucv_max_pathid) {
1562 printk(KERN_WARNING "iucv_do_int: Got interrupt with " 1562 WARN_ON(p->ippathid >= iucv_max_pathid);
1563 "pathid %d > max_connections (%ld)\n",
1564 p->ippathid, iucv_max_pathid - 1);
1565 iucv_sever_pathid(p->ippathid, iucv_error_no_listener); 1563 iucv_sever_pathid(p->ippathid, iucv_error_no_listener);
1566 return; 1564 return;
1567 } 1565 }
1568 if (p->iptype < 0x01 || p->iptype > 0x09) { 1566 BUG_ON(p->iptype < 0x01 || p->iptype > 0x09);
1569 printk(KERN_ERR "iucv_do_int: unknown iucv interrupt\n");
1570 return;
1571 }
1572 work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC); 1567 work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC);
1573 if (!work) { 1568 if (!work) {
1574 printk(KERN_WARNING "iucv_external_interrupt: out of memory\n"); 1569 printk(KERN_WARNING "iucv_external_interrupt: out of memory\n");