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

Commit b73e9e3c authored by wangweidong's avatar wangweidong Committed by David S. Miller
Browse files

x25: convert printks to pr_<level> 



use pr_<level> instead of printk(LEVEL)

Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarWang Weidong <wangweidong1@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d346a3fa

net/x25/af_x25.c

+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
 *					response

 */



#define pr_fmt(fmt) "X25: " fmt



#include <linux/module.h>

#include <linux/capability.h>

#include <linux/errno.h>
@@ -1809,7 +1811,7 @@ static int __init x25_init(void) 
	if (rc != 0)

		goto out_sock;



	printk(KERN_INFO "X.25 for Linux Version 0.2\n");

	pr_info("Linux Version 0.2\n");



	x25_register_sysctl();

	rc = x25_proc_init();

net/x25/x25_dev.c

+6 −4
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
 *      2000-09-04	Henner Eisen	Prevent freeing a dangling skb.

 */



#define pr_fmt(fmt) "X25: " fmt



#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/skbuff.h>
@@ -89,7 +91,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb) 
*/



	if (frametype != X25_CLEAR_CONFIRMATION)

		printk(KERN_DEBUG "x25_receive_data(): unknown frame type %2x\n",frametype);

		pr_debug("x25_receive_data(): unknown frame type %2x\n",frametype);



	return 0;

}
@@ -114,7 +116,7 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev, 
	 */

	nb = x25_get_neigh(dev);

	if (!nb) {

		printk(KERN_DEBUG "X.25: unknown neighbour - %s\n", dev->name);

		pr_debug("unknown neighbour - %s\n", dev->name);

		goto drop;

	}
@@ -154,7 +156,7 @@ void x25_establish_link(struct x25_neigh *nb) 
	switch (nb->dev->type) {

	case ARPHRD_X25:

		if ((skb = alloc_skb(1, GFP_ATOMIC)) == NULL) {

			printk(KERN_ERR "x25_dev: out of memory\n");

			pr_err("x25_dev: out of memory\n");

			return;

		}

		ptr  = skb_put(skb, 1);
@@ -189,7 +191,7 @@ void x25_terminate_link(struct x25_neigh *nb) 


	skb = alloc_skb(1, GFP_ATOMIC);

	if (!skb) {

		printk(KERN_ERR "x25_dev: out of memory\n");

		pr_err("x25_dev: out of memory\n");

		return;

	}

net/x25/x25_facilities.c

+8 −6
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
 *					on response.

 */



#define pr_fmt(fmt) "X25: " fmt



#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/skbuff.h>
@@ -109,7 +111,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, 
			case X25_MARKER:

				break;

			default:

				printk(KERN_DEBUG "X.25: unknown facility "

				pr_debug("unknown facility "

				       "%02X, value %02X\n",

				       p[0], p[1]);

				break;
@@ -132,7 +134,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, 
				*vc_fac_mask |= X25_MASK_WINDOW_SIZE;

				break;

			default:

				printk(KERN_DEBUG "X.25: unknown facility "

				pr_debug("unknown facility "

				       "%02X, values %02X, %02X\n",

				       p[0], p[1], p[2]);

				break;
@@ -143,7 +145,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, 
		case X25_FAC_CLASS_C:

			if (len < 4)

				return -1;

			printk(KERN_DEBUG "X.25: unknown facility %02X, "

			pr_debug("unknown facility %02X, "

			       "values %02X, %02X, %02X\n",

			       p[0], p[1], p[2], p[3]);

			p   += 4;
@@ -172,7 +174,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, 
				*vc_fac_mask |= X25_MASK_CALLED_AE;

				break;

			default:

				printk(KERN_DEBUG "X.25: unknown facility %02X,"

				pr_debug("unknown facility %02X,"

					"length %d\n", p[0], p[1]);

				break;

			}
@@ -341,12 +343,12 @@ void x25_limit_facilities(struct x25_facilities *facilities, 


	if (!nb->extended) {

		if (facilities->winsize_in  > 7) {

			printk(KERN_DEBUG "X.25: incoming winsize limited to 7\n");

			pr_debug("incoming winsize limited to 7\n");

			facilities->winsize_in = 7;

		}

		if (facilities->winsize_out > 7) {

			facilities->winsize_out = 7;

			printk( KERN_DEBUG "X.25: outgoing winsize limited to 7\n");

			pr_debug("outgoing winsize limited to 7\n");

		}

	}

}

net/x25/x25_forward.c

+4 −1
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
 *	History

 *	03-01-2007	Added forwarding for x.25	Andrew Hendry

 */



#define pr_fmt(fmt) "X25: " fmt



#include <linux/if_arp.h>

#include <linux/init.h>

#include <linux/slab.h>
@@ -51,7 +54,7 @@ int x25_forward_call(struct x25_address *dest_addr, struct x25_neigh *from, 
	list_for_each(entry, &x25_forward_list) {

		x25_frwd = list_entry(entry, struct x25_forward, node);

		if (x25_frwd->lci == lci) {

			printk(KERN_WARNING "X.25: call request for lci which is already registered!, transmitting but not registering new pair\n");

			pr_warn("call request for lci which is already registered!, transmitting but not registering new pair\n");

			same_lci = 1;

		}

	}

net/x25/x25_in.c

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 *					  i-frames.

 */



#define pr_fmt(fmt) "X25: " fmt



#include <linux/slab.h>

#include <linux/errno.h>

#include <linux/kernel.h>
@@ -317,7 +319,7 @@ static int x25_state3_machine(struct sock *sk, struct sk_buff *skb, int frametyp 
			break;



		default:

			printk(KERN_WARNING "x25: unknown %02X in state 3\n", frametype);

			pr_warn("unknown %02X in state 3\n", frametype);

			break;

	}