Patchwork [U-Boot,v2,5/8] net/net.c: cosmetic: fix pointer syntax issues

login
register
mail settings
Submitter Luca Ceresoli
Date May 11, 2011, 1:59 p.m.
Message ID <1305122401-14967-6-git-send-email-luca.ceresoli@comelit.it>
Download mbox | patch
Permalink /patch/95151/
State Accepted
Headers show

Comments

Luca Ceresoli - May 11, 2011, 1:59 p.m.
This removes the following checkpatch issues:
 - ERROR: "foo * bar" should be "foo *bar"
 - ERROR: "(foo*)" should be "(foo *)"

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Ben Warren <biggerbadderben@gmail.com>
Cc: Mike Frysinger <vapier@gentoo.org>

---
Changes since v1: none.

 net/net.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)
Wolfgang Denk - May 12, 2011, 8:17 p.m.
Dear Luca Ceresoli,

In message <1305122401-14967-6-git-send-email-luca.ceresoli@comelit.it> you wrote:
> This removes the following checkpatch issues:
>  - ERROR: "foo * bar" should be "foo *bar"
>  - ERROR: "(foo*)" should be "(foo *)"
> 
> Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Ben Warren <biggerbadderben@gmail.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> 
> ---
> Changes since v1: none.
> 
>  net/net.c |   36 ++++++++++++++++++------------------
>  1 files changed, 18 insertions(+), 18 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/net/net.c b/net/net.c
index c22da5f..f8c852d 100644
--- a/net/net.c
+++ b/net/net.c
@@ -592,7 +592,7 @@  startAgainTimeout(void)
 }
 
 static void
-startAgainHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
+startAgainHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len)
 {
 	/* Totally ignore the packet */
 }
@@ -653,14 +653,14 @@  void NetStartAgain(void)
  */
 
 void
-NetSetHandler(rxhand_f * f)
+NetSetHandler(rxhand_f *f)
 {
 	packetHandler = f;
 }
 
 
 void
-NetSetTimeout(ulong iv, thand_f * f)
+NetSetTimeout(ulong iv, thand_f *f)
 {
 	if (iv == 0) {
 		timeHandler = (thand_f *)0;
@@ -673,7 +673,7 @@  NetSetTimeout(ulong iv, thand_f * f)
 
 
 void
-NetSendPacket(volatile uchar * pkt, int len)
+NetSendPacket(volatile uchar *pkt, int len)
 {
 	(void) eth_send(pkt, len);
 }
@@ -768,9 +768,9 @@  int PingSend(void)
 	ip->ip_p     = 0x01;		/* ICMP */
 	ip->ip_sum   = 0;
 	/* already in network byte order */
-	NetCopyIP((void*)&ip->ip_src, &NetOurIP);
+	NetCopyIP((void *)&ip->ip_src, &NetOurIP);
 	/* - "" - */
-	NetCopyIP((void*)&ip->ip_dst, &NetPingIP);
+	NetCopyIP((void *)&ip->ip_dst, &NetPingIP);
 	ip->ip_sum   = ~NetCksum((uchar *)ip, IP_HDR_SIZE_NO_UDP / 2);
 
 	s = &ip->udp_src;		/* XXX ICMP starts here */
@@ -799,7 +799,7 @@  PingTimeout(void)
 }
 
 static void
-PingHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
+PingHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len)
 {
 	IPaddr_t tmp;
 	volatile IP_t *ip = (volatile IP_t *)pkt;
@@ -1042,13 +1042,13 @@  CDPTimeout(void)
 }
 
 static void
-CDPDummyHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
+CDPDummyHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len)
 {
 	/* nothing */
 }
 
 static void
-CDPHandler(const uchar * pkt, unsigned len)
+CDPHandler(const uchar *pkt, unsigned len)
 {
 	const uchar *t;
 	const ushort *ss;
@@ -1354,7 +1354,7 @@  static inline IP_t *NetDefragment(IP_t *ip, int *lenp)
 #endif
 
 void
-NetReceive(volatile uchar * inpkt, int len)
+NetReceive(volatile uchar *inpkt, int len)
 {
 	Ethernet_t *et;
 	IP_t	*ip;
@@ -1662,8 +1662,8 @@  NetReceive(volatile uchar * inpkt, int len)
 
 				ip->ip_sum = 0;
 				ip->ip_off = 0;
-				NetCopyIP((void*)&ip->ip_dst, &ip->ip_src);
-				NetCopyIP((void*)&ip->ip_src, &NetOurIP);
+				NetCopyIP((void *)&ip->ip_dst, &ip->ip_src);
+				NetCopyIP((void *)&ip->ip_src, &NetOurIP);
 				ip->ip_sum = ~NetCksum((uchar *)ip,
 						       IP_HDR_SIZE_NO_UDP >> 1);
 
@@ -1833,14 +1833,14 @@  static int net_check_prereq(proto_t protocol)
 /**********************************************************************/
 
 int
-NetCksumOk(uchar * ptr, int len)
+NetCksumOk(uchar *ptr, int len)
 {
 	return !((NetCksum(ptr, len) + 1) & 0xfffe);
 }
 
 
 unsigned
-NetCksum(uchar * ptr, int len)
+NetCksum(uchar *ptr, int len)
 {
 	ulong	xsum;
 	ushort *p = (ushort *)ptr;
@@ -1867,7 +1867,7 @@  NetEthHdrSize(void)
 }
 
 int
-NetSetEther(volatile uchar * xet, uchar * addr, uint prot)
+NetSetEther(volatile uchar *xet, uchar * addr, uint prot)
 {
 	Ethernet_t *et = (Ethernet_t *)xet;
 	ushort myvlanid;
@@ -1892,7 +1892,7 @@  NetSetEther(volatile uchar * xet, uchar * addr, uint prot)
 }
 
 void
-NetSetIP(volatile uchar * xip, IPaddr_t dest, int dport, int sport, int len)
+NetSetIP(volatile uchar *xip, IPaddr_t dest, int dport, int sport, int len)
 {
 	IP_t *ip = (IP_t *)xip;
 
@@ -1918,9 +1918,9 @@  NetSetIP(volatile uchar * xip, IPaddr_t dest, int dport, int sport, int len)
 	ip->ip_p     = 17;		/* UDP */
 	ip->ip_sum   = 0;
 	/* already in network byte order */
-	NetCopyIP((void*)&ip->ip_src, &NetOurIP);
+	NetCopyIP((void *)&ip->ip_src, &NetOurIP);
 	/* - "" - */
-	NetCopyIP((void*)&ip->ip_dst, &dest);
+	NetCopyIP((void *)&ip->ip_dst, &dest);
 	ip->udp_src  = htons(sport);
 	ip->udp_dst  = htons(dport);
 	ip->udp_len  = htons(8 + len);