Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759645AbYFYOk5 (ORCPT ); Wed, 25 Jun 2008 10:40:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756254AbYFYOgp (ORCPT ); Wed, 25 Jun 2008 10:36:45 -0400 Received: from mtagate3.de.ibm.com ([195.212.29.152]:11019 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758000AbYFYOgf (ORCPT ); Wed, 25 Jun 2008 10:36:35 -0400 Message-Id: <20080625143615.981543822@de.ibm.com> References: <20080625143459.100139455@de.ibm.com> User-Agent: quilt/0.46-1 Date: Wed, 25 Jun 2008 16:35:17 +0200 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: "David S. Miller" , Ursula Braun Subject: [patch 18/21] Cleanup iucv printk messages. Content-Disposition: inline; filename=817-printk-iucv.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2680 Lines: 85 From: Ursula Braun Cc: David S. Miller Signed-off-by: Ursula Braun --- net/iucv/af_iucv.c | 8 ++------ net/iucv/iucv.c | 9 ++------- 2 files changed, 4 insertions(+), 13 deletions(-) Index: quilt-2.6/net/iucv/af_iucv.c =================================================================== --- quilt-2.6.orig/net/iucv/af_iucv.c +++ quilt-2.6/net/iucv/af_iucv.c @@ -1135,8 +1135,7 @@ static void iucv_callback_txdone(struct if (this) kfree_skb(this); } - if (!this) - printk(KERN_ERR "AF_IUCV msg tag %u not found\n", msg->tag); + BUG_ON(!this); if (sk->sk_state == IUCV_CLOSING) { if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) { @@ -1196,7 +1195,7 @@ static int __init afiucv_init(void) } cpcmd("QUERY USERID", iucv_userid, sizeof(iucv_userid), &err); if (unlikely(err)) { - printk(KERN_ERR "AF_IUCV needs the VM userid\n"); + WARN_ON(err); err = -EPROTONOSUPPORT; goto out; } @@ -1210,7 +1209,6 @@ static int __init afiucv_init(void) err = sock_register(&iucv_sock_family_ops); if (err) goto out_proto; - printk(KERN_INFO "AF_IUCV lowlevel driver initialized\n"); return 0; out_proto: @@ -1226,8 +1224,6 @@ static void __exit afiucv_exit(void) sock_unregister(PF_IUCV); proto_unregister(&iucv_proto); iucv_unregister(&af_iucv_handler, 0); - - printk(KERN_INFO "AF_IUCV lowlevel driver unloaded\n"); } module_init(afiucv_init); Index: quilt-2.6/net/iucv/iucv.c =================================================================== --- quilt-2.6.orig/net/iucv/iucv.c +++ quilt-2.6/net/iucv/iucv.c @@ -1559,16 +1559,11 @@ static void iucv_external_interrupt(u16 p = iucv_irq_data[smp_processor_id()]; if (p->ippathid >= iucv_max_pathid) { - printk(KERN_WARNING "iucv_do_int: Got interrupt with " - "pathid %d > max_connections (%ld)\n", - p->ippathid, iucv_max_pathid - 1); + WARN_ON(p->ippathid >= iucv_max_pathid); iucv_sever_pathid(p->ippathid, iucv_error_no_listener); return; } - if (p->iptype < 0x01 || p->iptype > 0x09) { - printk(KERN_ERR "iucv_do_int: unknown iucv interrupt\n"); - return; - } + BUG_ON(p->iptype < 0x01 || p->iptype > 0x09); work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC); if (!work) { printk(KERN_WARNING "iucv_external_interrupt: out of memory\n"); -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/