af_econet: Use current logging styles and neatening

Use pr_fmt() without KBUILD_MODNAME to allow AUN and econet prefixes. Convert printks with KERN_DEBUG to pr_debug. Hoist assigns from if. 80 column wrapping. Move open braces to end of line. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>

af_econet: Use current logging styles and neatening
Use pr_fmt() without KBUILD_MODNAME to allow AUN and econet prefixes. Convert printks with KERN_DEBUG to pr_debug. Hoist assigns from if. 80 column wrapping. Move open braces to end of line. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Joe Perches · David S. Miller
1 parent 2a49e001cb
Showing 1 changed file with 74 additions and 75 deletions Side-by-side Diff
net/econet/af_econet.c
@@ -9,6 +9,8 @@
  *
  */
  
+#define pr_fmt(fmt) fmt
+
 #include <linux/module.h>
  
 #include <linux/types.h>
@@ -44,7 +46,7 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
  
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/system.h>
  
 static const struct proto_ops econet_ops;
@@ -63,9 +65,7 @@
 static struct socket *udpsock;
 #define AUN_PORT	0x8000
  
-
-struct aunhdr
-{
+struct aunhdr {
 	unsigned char code;		/* AUN magic protocol byte */
 	unsigned char port;
 	unsigned char cb;
@@ -82,8 +82,7 @@
 #endif		/* CONFIG_ECONET_AUNUDP */
  
 /* Per-packet information */
-struct ec_cb
-{
+struct ec_cb {
 	struct sockaddr_ec sec;
 	unsigned long cookie;		/* Supplied by user. */
 #ifdef CONFIG_ECONET_AUNUDP
@@ -137,7 +136,7 @@
 	 *	but then it will block.
 	 */
  
-	skb=skb_recv_datagram(sk,flags,flags&MSG_DONTWAIT,&err);
+	skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);
  
 	/*
 	 *	An error occurred so return it. Because skb_recv_datagram()
@@ -145,7 +144,7 @@
 	 *	retries.
 	 */
  
-	if(skb==NULL)
+	if (skb == NULL)
 		goto out;
  
 	/*
@@ -154,10 +153,9 @@
 	 */
  
 	copied = skb->len;
-	if (copied > len)
-	{
-		copied=len;
-		msg->msg_flags|=MSG_TRUNC;
+	if (copied > len) {
+		copied = len;
+		msg->msg_flags |= MSG_TRUNC;
 	}
  
 	/* We can't use skb_copy_datagram here */
@@ -186,7 +184,8 @@
  *	Bind an Econet socket.
  */
  
-static int econet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
+static int econet_bind(struct socket *sock, struct sockaddr *uaddr,
+		       int addr_len)
 {
 	struct sockaddr_ec *sec = (struct sockaddr_ec *)uaddr;
 	struct sock *sk;
@@ -226,9 +225,8 @@
 	struct ec_cb *eb;
 	struct sockaddr_ec *sec;
  
-	if (skb == NULL)
-	{
-		printk(KERN_DEBUG "ec: memory squeeze, transmit result dropped.\n");
+	if (skb == NULL) {
+		pr_debug("econet: memory squeeze, transmit result dropped\n");
 		return;
 	}
  
@@ -265,7 +263,7 @@
 static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
 			  struct msghdr *msg, size_t len)
 {
-	struct sockaddr_ec *saddr=(struct sockaddr_ec *)msg->msg_name;
+	struct sockaddr_ec *saddr = (struct sockaddr_ec *)msg->msg_name;
 	struct net_device *dev;
 	struct ec_addr addr;
 	int err;
@@ -298,14 +296,14 @@
  
 	mutex_lock(&econet_mutex);
  
-        if (saddr == NULL || msg->msg_namelen < sizeof(struct sockaddr_ec)) {
-                mutex_unlock(&econet_mutex);
-                return -EINVAL;
-        }
-        addr.station = saddr->addr.station;
-        addr.net = saddr->addr.net;
-        port = saddr->port;
-        cb = saddr->cb;
+	if (saddr == NULL || msg->msg_namelen < sizeof(struct sockaddr_ec)) {
+		mutex_unlock(&econet_mutex);
+		return -EINVAL;
+	}
+	addr.station = saddr->addr.station;
+	addr.net = saddr->addr.net;
+	port = saddr->port;
+	cb = saddr->cb;
  
 	/* Look for a device with the right network number. */
 	dev = net2dev_map[addr.net];
  
@@ -333,9 +331,9 @@
  
 		dev_hold(dev);
  
-		skb = sock_alloc_send_skb(sk, len+LL_ALLOCATED_SPACE(dev),
+		skb = sock_alloc_send_skb(sk, len + LL_ALLOCATED_SPACE(dev),
 					  msg->msg_flags & MSG_DONTWAIT, &err);
-		if (skb==NULL)
+		if (skb == NULL)
 			goto out_unlock;
  
 		skb_reserve(skb, LL_RESERVED_SPACE(dev));
@@ -355,7 +353,7 @@
 			struct ec_framehdr *fh;
 			/* Poke in our control byte and
 			   port number.  Hack, hack.  */
-			fh = (struct ec_framehdr *)(skb->data);
+			fh = (struct ec_framehdr *)skb->data;
 			fh->cb = cb;
 			fh->port = port;
 			if (sock->type != SOCK_DGRAM) {
@@ -365,7 +363,7 @@
 		}
  
 		/* Copy the data. Returns -EFAULT on error */
-		err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len);
+		err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
 		skb->protocol = proto;
 		skb->dev = dev;
 		skb->priority = sk->sk_priority;
  
@@ -385,9 +383,9 @@
 		mutex_unlock(&econet_mutex);
 		return len;
  
-	out_free:
+out_free:
 		kfree_skb(skb);
-	out_unlock:
+out_unlock:
 		if (dev)
 			dev_put(dev);
 #else
  
@@ -458,15 +456,14 @@
 		goto error_free_buf;
  
 	/* Get a skbuff (no data, just holds our cb information) */
-	if ((skb = sock_alloc_send_skb(sk, 0,
-				       msg->msg_flags & MSG_DONTWAIT,
-				       &err)) == NULL)
+	skb = sock_alloc_send_skb(sk, 0, msg->msg_flags & MSG_DONTWAIT, &err);
+	if (skb == NULL)
 		goto error_free_buf;
  
 	eb = (struct ec_cb *)&skb->cb;
  
 	eb->cookie = saddr->cookie;
-	eb->timeout = (5*HZ);
+	eb->timeout = 5 * HZ;
 	eb->start = jiffies;
 	ah.handle = aun_seq;
 	eb->seq = (aun_seq++);
  
@@ -480,9 +477,10 @@
 	udpmsg.msg_iovlen = 2;
 	udpmsg.msg_control = NULL;
 	udpmsg.msg_controllen = 0;
-	udpmsg.msg_flags=0;
+	udpmsg.msg_flags = 0;
  
-	oldfs = get_fs(); set_fs(KERNEL_DS);	/* More privs :-) */
+	oldfs = get_fs();
+	set_fs(KERNEL_DS);		/* More privs :-) */
 	err = sock_sendmsg(udpsock, &udpmsg, size);
 	set_fs(oldfs);
  
@@ -530,7 +528,7 @@
  
 static void econet_destroy_timer(unsigned long data)
 {
-	struct sock *sk=(struct sock *)data;
+	struct sock *sk = (struct sock *)data;
  
 	if (!sk_has_allocations(sk)) {
 		sk_free(sk);
@@ -539,7 +537,7 @@
  
 	sk->sk_timer.expires = jiffies + 10 * HZ;
 	add_timer(&sk->sk_timer);
-	printk(KERN_DEBUG "econet socket destroy delayed\n");
+	pr_debug("econet: socket destroy delayed\n");
 }
  
 /*
@@ -651,7 +649,8 @@
 	if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
 		return -EFAULT;
  
-	if ((dev = dev_get_by_name(&init_net, ifr.ifr_name)) == NULL)
+	dev = dev_get_by_name(&init_net, ifr.ifr_name);
+	if (dev == NULL)
 		return -ENODEV;
  
 	sec = (struct sockaddr_ec *)&ifr.ifr_addr;
@@ -715,7 +714,8 @@
  *	Handle generic ioctls
  */
  
-static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+static int econet_ioctl(struct socket *sock, unsigned int cmd,
+			unsigned long arg)
 {
 	struct sock *sk = sock->sk;
 	void __user *argp = (void __user *)arg;
@@ -833,7 +833,7 @@
 	udpmsg.msg_namelen = sizeof(sin);
 	udpmsg.msg_control = NULL;
 	udpmsg.msg_controllen = 0;
-	udpmsg.msg_flags=0;
+	udpmsg.msg_flags = 0;
  
 	kernel_sendmsg(udpsock, &udpmsg, &iov, 1, sizeof(ah));
 }
  
  
  
  
@@ -856,26 +856,25 @@
 	if (dst)
 		edev = dst->dev->ec_ptr;
  
-	if (! edev)
+	if (!edev)
 		goto bad;
  
-	if ((sk = ec_listening_socket(ah->port, stn, edev->net)) == NULL)
+	sk = ec_listening_socket(ah->port, stn, edev->net);
+	if (sk == NULL)
 		goto bad;		/* Nobody wants it */
  
 	newskb = alloc_skb((len - sizeof(struct aunhdr) + 15) & ~15,
 			   GFP_ATOMIC);
-	if (newskb == NULL)
-	{
-		printk(KERN_DEBUG "AUN: memory squeeze, dropping packet.\n");
+	if (newskb == NULL) {
+		pr_debug("AUN: memory squeeze, dropping packet\n");
 		/* Send nack and hope sender tries again */
 		goto bad;
 	}
  
-	memcpy(skb_put(newskb, len - sizeof(struct aunhdr)), (void *)(ah+1),
+	memcpy(skb_put(newskb, len - sizeof(struct aunhdr)), (void *)(ah + 1),
 	       len - sizeof(struct aunhdr));
  
-	if (ec_queue_packet(sk, newskb, stn, edev->net, ah->cb, ah->port))
-	{
+	if (ec_queue_packet(sk, newskb, stn, edev->net, ah->cb, ah->port)) {
 		/* Socket is bankrupt. */
 		kfree_skb(newskb);
 		goto bad;
@@ -911,7 +910,7 @@
 			goto foundit;
 	}
 	spin_unlock_irqrestore(&aun_queue_lock, flags);
-	printk(KERN_DEBUG "AUN: unknown sequence %ld\n", seq);
+	pr_debug("AUN: unknown sequence %ld\n", seq);
 	return;
  
 foundit:
  
  
@@ -936,18 +935,17 @@
  
 	while ((skb = skb_recv_datagram(sk, 0, 1, &err)) == NULL) {
 		if (err == -EAGAIN) {
-			printk(KERN_ERR "AUN: no data available?!");
+			pr_err("AUN: no data available?!\n");
 			return;
 		}
-		printk(KERN_DEBUG "AUN: recvfrom() error %d\n", -err);
+		pr_debug("AUN: recvfrom() error %d\n", -err);
 	}
  
 	data = skb_transport_header(skb) + sizeof(struct udphdr);
 	ah = (struct aunhdr *)data;
 	len = skb->len - sizeof(struct udphdr);
  
-	switch (ah->code)
-	{
+	switch (ah->code) {
 	case 2:
 		aun_incoming(skb, ah, len);
 		break;
@@ -958,7 +956,7 @@
 		aun_tx_ack(ah->handle, ECTYPE_TRANSMIT_NOT_LISTENING);
 		break;
 	default:
-		printk(KERN_DEBUG "unknown AUN packet (type %d)\n", data[0]);
+		pr_debug("AUN: unknown packet type: %d\n", data[0]);
 	}
  
 	skb_free_datagram(sk, skb);
@@ -988,7 +986,7 @@
 	}
 	spin_unlock_irqrestore(&aun_queue_lock, flags);
  
-	mod_timer(&ab_cleanup_timer, jiffies + (HZ*2));
+	mod_timer(&ab_cleanup_timer, jiffies + (HZ * 2));
 }
  
 static int __init aun_udp_initialise(void)
@@ -998,7 +996,7 @@
  
 	skb_queue_head_init(&aun_queue);
 	setup_timer(&ab_cleanup_timer, ab_cleanup, 0);
-	ab_cleanup_timer.expires = jiffies + (HZ*2);
+	ab_cleanup_timer.expires = jiffies + (HZ * 2);
 	add_timer(&ab_cleanup_timer);
  
 	memset(&sin, 0, sizeof(sin));
@@ -1006,9 +1004,9 @@
  
 	/* We can count ourselves lucky Acorn machines are too dim to
 	   speak IPv6. :-) */
-	if ((error = sock_create_kern(PF_INET, SOCK_DGRAM, 0, &udpsock)) < 0)
-	{
-		printk("AUN: socket error %d\n", -error);
+	error = sock_create_kern(PF_INET, SOCK_DGRAM, 0, &udpsock);
+	if (error < 0) {
+		pr_err("AUN: socket error %d\n", -error);
 		return error;
 	}
  
@@ -1017,10 +1015,9 @@
 						    from interrupts */
  
 	error = udpsock->ops->bind(udpsock, (struct sockaddr *)&sin,
-				sizeof(sin));
-	if (error < 0)
-	{
-		printk("AUN: bind error %d\n", -error);
+				   sizeof(sin));
+	if (error < 0) {
+		pr_err("AUN: bind error %d\n", -error);
 		goto release;
 	}
  
@@ -1041,7 +1038,8 @@
  *	Receive an Econet frame from a device.
  */
  
-static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
+static int econet_rcv(struct sk_buff *skb, struct net_device *dev,
+		      struct packet_type *pt, struct net_device *orig_dev)
 {
 	struct ec_framehdr *hdr;
 	struct sock *sk = NULL;
  
@@ -1056,13 +1054,14 @@
 	if (!edev)
 		goto drop;
  
-	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+	skb = skb_share_check(skb, GFP_ATOMIC);
+	if (skb == NULL)
 		return NET_RX_DROP;
  
 	if (!pskb_may_pull(skb, sizeof(struct ec_framehdr)))
 		goto drop;
  
-	hdr = (struct ec_framehdr *) skb->data;
+	hdr = (struct ec_framehdr *)skb->data;
  
 	/* First check for encapsulated IP */
 	if (hdr->port == EC_PORT_IP) {
@@ -1090,8 +1089,8 @@
 }
  
 static struct packet_type econet_packet_type __read_mostly = {
-	.type =		cpu_to_be16(ETH_P_ECONET),
-	.func =		econet_rcv,
+	.type =	cpu_to_be16(ETH_P_ECONET),
+	.func =	econet_rcv,
 };
  
 static void econet_hw_initialise(void)
  
@@ -1101,9 +1100,10 @@
  
 #endif
  
-static int econet_notifier(struct notifier_block *this, unsigned long msg, void *data)
+static int econet_notifier(struct notifier_block *this, unsigned long msg,
+			   void *data)
 {
-	struct net_device *dev = (struct net_device *)data;
+	struct net_device *dev = data;
 	struct ec_device *edev;
  
 	if (!net_eq(dev_net(dev), &init_net))
@@ -1113,8 +1113,7 @@
 	case NETDEV_UNREGISTER:
 		/* A device has gone down - kill any data we hold for it. */
 		edev = dev->ec_ptr;
-		if (edev)
-		{
+		if (edev) {
 			if (net2dev_map[0] == dev)
 				net2dev_map[0] = NULL;
 			net2dev_map[edev->net] = NULL;
@@ -1128,7 +1127,7 @@
 }
  
 static struct notifier_block econet_netdev_notifier = {
-	.notifier_call =econet_notifier,
+	.notifier_call = econet_notifier,
 };
  
 static void __exit econet_proto_exit(void)
...	...	@@ -9,6 +9,8 @@
9	9	*
10	10	*/
11	11
	12	+#define pr_fmt(fmt) fmt
	13	+
12	14	#include <linux/module.h>
13	15
14	16	#include <linux/types.h>
...	...	@@ -44,7 +46,7 @@
44	46	#include <linux/bitops.h>
45	47	#include <linux/mutex.h>
46	48
47		-#include <asm/uaccess.h>
	49	+#include <linux/uaccess.h>
48	50	#include <asm/system.h>
49	51
50	52	static const struct proto_ops econet_ops;
...	...	@@ -63,9 +65,7 @@
63	65	static struct socket *udpsock;
64	66	#define AUN_PORT 0x8000
65	67
66		-
67		-struct aunhdr
68		-{
	68	+struct aunhdr {
69	69	unsigned char code; /* AUN magic protocol byte */
70	70	unsigned char port;
71	71	unsigned char cb;
...	...	@@ -82,8 +82,7 @@
82	82	#endif /* CONFIG_ECONET_AUNUDP */
83	83
84	84	/* Per-packet information */
85		-struct ec_cb
86		-{
	85	+struct ec_cb {
87	86	struct sockaddr_ec sec;
88	87	unsigned long cookie; /* Supplied by user. */
89	88	#ifdef CONFIG_ECONET_AUNUDP
...	...	@@ -137,7 +136,7 @@
137	136	* but then it will block.
138	137	*/
139	138
140		- skb=skb_recv_datagram(sk,flags,flags&MSG_DONTWAIT,&err);
	139	+ skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);
141	140
142	141	/*
143	142	* An error occurred so return it. Because skb_recv_datagram()
...	...	@@ -145,7 +144,7 @@
145	144	* retries.
146	145	*/
147	146
148		- if(skb==NULL)
	147	+ if (skb == NULL)
149	148	goto out;
150	149
151	150	/*
...	...	@@ -154,10 +153,9 @@
154	153	*/
155	154
156	155	copied = skb->len;
157		- if (copied > len)
158		- {
159		- copied=len;
160		- msg->msg_flags\|=MSG_TRUNC;
	156	+ if (copied > len) {
	157	+ copied = len;
	158	+ msg->msg_flags \|= MSG_TRUNC;
161	159	}
162	160
163	161	/* We can't use skb_copy_datagram here */
...	...	@@ -186,7 +184,8 @@
186	184	* Bind an Econet socket.
187	185	*/
188	186
189		-static int econet_bind(struct socket sock, struct sockaddr uaddr, int addr_len)
	187	+static int econet_bind(struct socket sock, struct sockaddr uaddr,
	188	+ int addr_len)
190	189	{
191	190	struct sockaddr_ec sec = (struct sockaddr_ec )uaddr;
192	191	struct sock *sk;
...	...	@@ -226,9 +225,8 @@
226	225	struct ec_cb *eb;
227	226	struct sockaddr_ec *sec;
228	227
229		- if (skb == NULL)
230		- {
231		- printk(KERN_DEBUG "ec: memory squeeze, transmit result dropped.\n");
	228	+ if (skb == NULL) {
	229	+ pr_debug("econet: memory squeeze, transmit result dropped\n");
232	230	return;
233	231	}
234	232
...	...	@@ -265,7 +263,7 @@
265	263	static int econet_sendmsg(struct kiocb iocb, struct socket sock,
266	264	struct msghdr *msg, size_t len)
267	265	{
268		- struct sockaddr_ec saddr=(struct sockaddr_ec )msg->msg_name;
	266	+ struct sockaddr_ec saddr = (struct sockaddr_ec )msg->msg_name;
269	267	struct net_device *dev;
270	268	struct ec_addr addr;
271	269	int err;
...	...	@@ -298,14 +296,14 @@
298	296
299	297	mutex_lock(&econet_mutex);
300	298
301		- if (saddr == NULL \|\| msg->msg_namelen < sizeof(struct sockaddr_ec)) {
302		- mutex_unlock(&econet_mutex);
303		- return -EINVAL;
304		- }
305		- addr.station = saddr->addr.station;
306		- addr.net = saddr->addr.net;
307		- port = saddr->port;
308		- cb = saddr->cb;
	299	+ if (saddr == NULL \|\| msg->msg_namelen < sizeof(struct sockaddr_ec)) {
	300	+ mutex_unlock(&econet_mutex);
	301	+ return -EINVAL;
	302	+ }
	303	+ addr.station = saddr->addr.station;
	304	+ addr.net = saddr->addr.net;
	305	+ port = saddr->port;
	306	+ cb = saddr->cb;
309	307
310	308	/* Look for a device with the right network number. */
311	309	dev = net2dev_map[addr.net];
312	310
...	...	@@ -333,9 +331,9 @@
333	331
334	332	dev_hold(dev);
335	333
336		- skb = sock_alloc_send_skb(sk, len+LL_ALLOCATED_SPACE(dev),
	334	+ skb = sock_alloc_send_skb(sk, len + LL_ALLOCATED_SPACE(dev),
337	335	msg->msg_flags & MSG_DONTWAIT, &err);
338		- if (skb==NULL)
	336	+ if (skb == NULL)
339	337	goto out_unlock;
340	338
341	339	skb_reserve(skb, LL_RESERVED_SPACE(dev));
...	...	@@ -355,7 +353,7 @@
355	353	struct ec_framehdr *fh;
356	354	/* Poke in our control byte and
357	355	port number. Hack, hack. */
358		- fh = (struct ec_framehdr *)(skb->data);
	356	+ fh = (struct ec_framehdr *)skb->data;
359	357	fh->cb = cb;
360	358	fh->port = port;
361	359	if (sock->type != SOCK_DGRAM) {
...	...	@@ -365,7 +363,7 @@
365	363	}
366	364
367	365	/* Copy the data. Returns -EFAULT on error */
368		- err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len);
	366	+ err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
369	367	skb->protocol = proto;
370	368	skb->dev = dev;
371	369	skb->priority = sk->sk_priority;
372	370
...	...	@@ -385,9 +383,9 @@
385	383	mutex_unlock(&econet_mutex);
386	384	return len;
387	385
388		- out_free:
	386	+out_free:
389	387	kfree_skb(skb);
390		- out_unlock:
	388	+out_unlock:
391	389	if (dev)
392	390	dev_put(dev);
393	391	#else
394	392
...	...	@@ -458,15 +456,14 @@
458	456	goto error_free_buf;
459	457
460	458	/* Get a skbuff (no data, just holds our cb information) */
461		- if ((skb = sock_alloc_send_skb(sk, 0,
462		- msg->msg_flags & MSG_DONTWAIT,
463		- &err)) == NULL)
	459	+ skb = sock_alloc_send_skb(sk, 0, msg->msg_flags & MSG_DONTWAIT, &err);
	460	+ if (skb == NULL)
464	461	goto error_free_buf;
465	462
466	463	eb = (struct ec_cb *)&skb->cb;
467	464
468	465	eb->cookie = saddr->cookie;
469		- eb->timeout = (5*HZ);
	466	+ eb->timeout = 5 * HZ;
470	467	eb->start = jiffies;
471	468	ah.handle = aun_seq;
472	469	eb->seq = (aun_seq++);
473	470
...	...	@@ -480,9 +477,10 @@
480	477	udpmsg.msg_iovlen = 2;
481	478	udpmsg.msg_control = NULL;
482	479	udpmsg.msg_controllen = 0;
483		- udpmsg.msg_flags=0;
	480	+ udpmsg.msg_flags = 0;
484	481
485		- oldfs = get_fs(); set_fs(KERNEL_DS); /* More privs :-) */
	482	+ oldfs = get_fs();
	483	+ set_fs(KERNEL_DS); /* More privs :-) */
486	484	err = sock_sendmsg(udpsock, &udpmsg, size);
487	485	set_fs(oldfs);
488	486
...	...	@@ -530,7 +528,7 @@
530	528
531	529	static void econet_destroy_timer(unsigned long data)
532	530	{
533		- struct sock sk=(struct sock )data;
	531	+ struct sock sk = (struct sock )data;
534	532
535	533	if (!sk_has_allocations(sk)) {
536	534	sk_free(sk);
...	...	@@ -539,7 +537,7 @@
539	537
540	538	sk->sk_timer.expires = jiffies + 10 * HZ;
541	539	add_timer(&sk->sk_timer);
542		- printk(KERN_DEBUG "econet socket destroy delayed\n");
	540	+ pr_debug("econet: socket destroy delayed\n");
543	541	}
544	542
545	543	/*
...	...	@@ -651,7 +649,8 @@
651	649	if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
652	650	return -EFAULT;
653	651
654		- if ((dev = dev_get_by_name(&init_net, ifr.ifr_name)) == NULL)
	652	+ dev = dev_get_by_name(&init_net, ifr.ifr_name);
	653	+ if (dev == NULL)
655	654	return -ENODEV;
656	655
657	656	sec = (struct sockaddr_ec *)&ifr.ifr_addr;
...	...	@@ -715,7 +714,8 @@
715	714	* Handle generic ioctls
716	715	*/
717	716
718		-static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
	717	+static int econet_ioctl(struct socket *sock, unsigned int cmd,
	718	+ unsigned long arg)
719	719	{
720	720	struct sock *sk = sock->sk;
721	721	void __user argp = (void __user )arg;
...	...	@@ -833,7 +833,7 @@
833	833	udpmsg.msg_namelen = sizeof(sin);
834	834	udpmsg.msg_control = NULL;
835	835	udpmsg.msg_controllen = 0;
836		- udpmsg.msg_flags=0;
	836	+ udpmsg.msg_flags = 0;
837	837
838	838	kernel_sendmsg(udpsock, &udpmsg, &iov, 1, sizeof(ah));
839	839	}
840	840
841	841
842	842
843	843
...	...	@@ -856,26 +856,25 @@
856	856	if (dst)
857	857	edev = dst->dev->ec_ptr;
858	858
859		- if (! edev)
	859	+ if (!edev)
860	860	goto bad;
861	861
862		- if ((sk = ec_listening_socket(ah->port, stn, edev->net)) == NULL)
	862	+ sk = ec_listening_socket(ah->port, stn, edev->net);
	863	+ if (sk == NULL)
863	864	goto bad; /* Nobody wants it */
864	865
865	866	newskb = alloc_skb((len - sizeof(struct aunhdr) + 15) & ~15,
866	867	GFP_ATOMIC);
867		- if (newskb == NULL)
868		- {
869		- printk(KERN_DEBUG "AUN: memory squeeze, dropping packet.\n");
	868	+ if (newskb == NULL) {
	869	+ pr_debug("AUN: memory squeeze, dropping packet\n");
870	870	/* Send nack and hope sender tries again */
871	871	goto bad;
872	872	}
873	873
874		- memcpy(skb_put(newskb, len - sizeof(struct aunhdr)), (void *)(ah+1),
	874	+ memcpy(skb_put(newskb, len - sizeof(struct aunhdr)), (void *)(ah + 1),
875	875	len - sizeof(struct aunhdr));
876	876
877		- if (ec_queue_packet(sk, newskb, stn, edev->net, ah->cb, ah->port))
878		- {
	877	+ if (ec_queue_packet(sk, newskb, stn, edev->net, ah->cb, ah->port)) {
879	878	/* Socket is bankrupt. */
880	879	kfree_skb(newskb);
881	880	goto bad;
...	...	@@ -911,7 +910,7 @@
911	910	goto foundit;
912	911	}
913	912	spin_unlock_irqrestore(&aun_queue_lock, flags);
914		- printk(KERN_DEBUG "AUN: unknown sequence %ld\n", seq);
	913	+ pr_debug("AUN: unknown sequence %ld\n", seq);
915	914	return;
916	915
917	916	foundit:
918	917
919	918
...	...	@@ -936,18 +935,17 @@
936	935
937	936	while ((skb = skb_recv_datagram(sk, 0, 1, &err)) == NULL) {
938	937	if (err == -EAGAIN) {
939		- printk(KERN_ERR "AUN: no data available?!");
	938	+ pr_err("AUN: no data available?!\n");
940	939	return;
941	940	}
942		- printk(KERN_DEBUG "AUN: recvfrom() error %d\n", -err);
	941	+ pr_debug("AUN: recvfrom() error %d\n", -err);
943	942	}
944	943
945	944	data = skb_transport_header(skb) + sizeof(struct udphdr);
946	945	ah = (struct aunhdr *)data;
947	946	len = skb->len - sizeof(struct udphdr);
948	947
949		- switch (ah->code)
950		- {
	948	+ switch (ah->code) {
951	949	case 2:
952	950	aun_incoming(skb, ah, len);
953	951	break;
...	...	@@ -958,7 +956,7 @@
958	956	aun_tx_ack(ah->handle, ECTYPE_TRANSMIT_NOT_LISTENING);
959	957	break;
960	958	default:
961		- printk(KERN_DEBUG "unknown AUN packet (type %d)\n", data[0]);
	959	+ pr_debug("AUN: unknown packet type: %d\n", data[0]);
962	960	}
963	961
964	962	skb_free_datagram(sk, skb);
...	...	@@ -988,7 +986,7 @@
988	986	}
989	987	spin_unlock_irqrestore(&aun_queue_lock, flags);
990	988
991		- mod_timer(&ab_cleanup_timer, jiffies + (HZ*2));
	989	+ mod_timer(&ab_cleanup_timer, jiffies + (HZ * 2));
992	990	}
993	991
994	992	static int __init aun_udp_initialise(void)
...	...	@@ -998,7 +996,7 @@
998	996
999	997	skb_queue_head_init(&aun_queue);
1000	998	setup_timer(&ab_cleanup_timer, ab_cleanup, 0);
1001		- ab_cleanup_timer.expires = jiffies + (HZ*2);
	999	+ ab_cleanup_timer.expires = jiffies + (HZ * 2);
1002	1000	add_timer(&ab_cleanup_timer);
1003	1001
1004	1002	memset(&sin, 0, sizeof(sin));
...	...	@@ -1006,9 +1004,9 @@
1006	1004
1007	1005	/* We can count ourselves lucky Acorn machines are too dim to
1008	1006	speak IPv6. :-) */
1009		- if ((error = sock_create_kern(PF_INET, SOCK_DGRAM, 0, &udpsock)) < 0)
1010		- {
1011		- printk("AUN: socket error %d\n", -error);
	1007	+ error = sock_create_kern(PF_INET, SOCK_DGRAM, 0, &udpsock);
	1008	+ if (error < 0) {
	1009	+ pr_err("AUN: socket error %d\n", -error);
1012	1010	return error;
1013	1011	}
1014	1012
...	...	@@ -1017,10 +1015,9 @@
1017	1015	from interrupts */
1018	1016
1019	1017	error = udpsock->ops->bind(udpsock, (struct sockaddr *)&sin,
1020		- sizeof(sin));
1021		- if (error < 0)
1022		- {
1023		- printk("AUN: bind error %d\n", -error);
	1018	+ sizeof(sin));
	1019	+ if (error < 0) {
	1020	+ pr_err("AUN: bind error %d\n", -error);
1024	1021	goto release;
1025	1022	}
1026	1023
...	...	@@ -1041,7 +1038,8 @@
1041	1038	* Receive an Econet frame from a device.
1042	1039	*/
1043	1040
1044		-static int econet_rcv(struct sk_buff skb, struct net_device dev, struct packet_type pt, struct net_device orig_dev)
	1041	+static int econet_rcv(struct sk_buff skb, struct net_device dev,
	1042	+ struct packet_type pt, struct net_device orig_dev)
1045	1043	{
1046	1044	struct ec_framehdr *hdr;
1047	1045	struct sock *sk = NULL;
1048	1046
...	...	@@ -1056,13 +1054,14 @@
1056	1054	if (!edev)
1057	1055	goto drop;
1058	1056
1059		- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
	1057	+ skb = skb_share_check(skb, GFP_ATOMIC);
	1058	+ if (skb == NULL)
1060	1059	return NET_RX_DROP;
1061	1060
1062	1061	if (!pskb_may_pull(skb, sizeof(struct ec_framehdr)))
1063	1062	goto drop;
1064	1063
1065		- hdr = (struct ec_framehdr *) skb->data;
	1064	+ hdr = (struct ec_framehdr *)skb->data;
1066	1065
1067	1066	/* First check for encapsulated IP */
1068	1067	if (hdr->port == EC_PORT_IP) {
...	...	@@ -1090,8 +1089,8 @@
1090	1089	}
1091	1090
1092	1091	static struct packet_type econet_packet_type __read_mostly = {
1093		- .type = cpu_to_be16(ETH_P_ECONET),
1094		- .func = econet_rcv,
	1092	+ .type = cpu_to_be16(ETH_P_ECONET),
	1093	+ .func = econet_rcv,
1095	1094	};
1096	1095
1097	1096	static void econet_hw_initialise(void)
1098	1097
...	...	@@ -1101,9 +1100,10 @@
1101	1100
1102	1101	#endif
1103	1102
1104		-static int econet_notifier(struct notifier_block this, unsigned long msg, void data)
	1103	+static int econet_notifier(struct notifier_block *this, unsigned long msg,
	1104	+ void *data)
1105	1105	{
1106		- struct net_device dev = (struct net_device )data;
	1106	+ struct net_device *dev = data;
1107	1107	struct ec_device *edev;
1108	1108
1109	1109	if (!net_eq(dev_net(dev), &init_net))
...	...	@@ -1113,8 +1113,7 @@
1113	1113	case NETDEV_UNREGISTER:
1114	1114	/* A device has gone down - kill any data we hold for it. */
1115	1115	edev = dev->ec_ptr;
1116		- if (edev)
1117		- {
	1116	+ if (edev) {
1118	1117	if (net2dev_map[0] == dev)
1119	1118	net2dev_map[0] = NULL;
1120	1119	net2dev_map[edev->net] = NULL;
...	...	@@ -1128,7 +1127,7 @@
1128	1127	}
1129	1128
1130	1129	static struct notifier_block econet_netdev_notifier = {
1131		- .notifier_call =econet_notifier,
	1130	+ .notifier_call = econet_notifier,
1132	1131	};
1133	1132
1134	1133	static void __exit econet_proto_exit(void)