Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2b4afd2 authored by Ursula Braun's avatar Ursula Braun Committed by Heiko Carstens
Browse files

[S390] Cleanup iucv printk messages. 



Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarUrsula Braun <braunu@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent a12c53f4

net/iucv/af_iucv.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -1135,8 +1135,7 @@ static void iucv_callback_txdone(struct iucv_path *path, 
		if (this)

		if (this)

			kfree_skb(this);

			kfree_skb(this);

	}

	}

	if (!this)

	BUG_ON(!this);

		printk(KERN_ERR "AF_IUCV msg tag %u not found\n", msg->tag);





	if (sk->sk_state == IUCV_CLOSING) {

	if (sk->sk_state == IUCV_CLOSING) {

		if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) {

		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);

	cpcmd("QUERY USERID", iucv_userid, sizeof(iucv_userid), &err);

	if (unlikely(err)) {

	if (unlikely(err)) {

		printk(KERN_ERR "AF_IUCV needs the VM userid\n");

		WARN_ON(err);

		err = -EPROTONOSUPPORT;

		err = -EPROTONOSUPPORT;

		goto out;

		goto out;

	}

	}
@@ -1210,7 +1209,6 @@ static int __init afiucv_init(void) 
	err = sock_register(&iucv_sock_family_ops);

	err = sock_register(&iucv_sock_family_ops);

	if (err)

	if (err)

		goto out_proto;

		goto out_proto;

	printk(KERN_INFO "AF_IUCV lowlevel driver initialized\n");

	return 0;

	return 0;





out_proto:

out_proto:
@@ -1226,8 +1224,6 @@ static void __exit afiucv_exit(void) 
	sock_unregister(PF_IUCV);

	sock_unregister(PF_IUCV);

	proto_unregister(&iucv_proto);

	proto_unregister(&iucv_proto);

	iucv_unregister(&af_iucv_handler, 0);

	iucv_unregister(&af_iucv_handler, 0);



	printk(KERN_INFO "AF_IUCV lowlevel driver unloaded\n");

}

}





module_init(afiucv_init);

module_init(afiucv_init);

net/iucv/iucv.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -1559,16 +1559,11 @@ static void iucv_external_interrupt(u16 code) 




	p = iucv_irq_data[smp_processor_id()];

	p = iucv_irq_data[smp_processor_id()];

	if (p->ippathid >= iucv_max_pathid) {

	if (p->ippathid >= iucv_max_pathid) {

		printk(KERN_WARNING "iucv_do_int: Got interrupt with "

		WARN_ON(p->ippathid >= iucv_max_pathid);

		       "pathid %d > max_connections (%ld)\n",

		       p->ippathid, iucv_max_pathid - 1);

		iucv_sever_pathid(p->ippathid, iucv_error_no_listener);

		iucv_sever_pathid(p->ippathid, iucv_error_no_listener);

		return;

		return;

	}

	}

	if (p->iptype  < 0x01 || p->iptype > 0x09) {

	BUG_ON(p->iptype  < 0x01 || p->iptype > 0x09);

		printk(KERN_ERR "iucv_do_int: unknown iucv interrupt\n");

		return;

	}

	work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC);

	work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC);

	if (!work) {

	if (!work) {

		printk(KERN_WARNING "iucv_external_interrupt: out of memory\n");

		printk(KERN_WARNING "iucv_external_interrupt: out of memory\n");