From patchwork Wed May 11 13:59:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 95151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 8D8B6B6FC1 for ; Thu, 12 May 2011 00:01:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D9B102809C; Wed, 11 May 2011 16:01:33 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WTjXDE6bmDak; Wed, 11 May 2011 16:01:33 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 487B5280C6; Wed, 11 May 2011 16:01:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A9342280A7 for ; Wed, 11 May 2011 16:00:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X67u23KVyjXC for ; Wed, 11 May 2011 16:00:41 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from adserver.comelit.it (mail.comelit.it [217.56.59.218]) by theia.denx.de (Postfix) with ESMTP id F3AE428090 for ; Wed, 11 May 2011 16:00:39 +0200 (CEST) Received: from com-exc-01.comelit.it ([172.24.0.31]) by adserver.comelit.it with Microsoft SMTPSVC(6.0.3790.1830); Wed, 11 May 2011 15:59:40 +0200 Received: from wallace.comelit.it ([172.20.0.35]) by com-exc-01.comelit.it with Microsoft SMTPSVC(6.0.3790.4675); Wed, 11 May 2011 16:00:37 +0200 From: Luca Ceresoli To: u-boot@lists.denx.de Date: Wed, 11 May 2011 15:59:58 +0200 Message-Id: <1305122401-14967-6-git-send-email-luca.ceresoli@comelit.it> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1304512847-7351-1-git-send-email-luca.ceresoli@comelit.it> References: <1304512847-7351-1-git-send-email-luca.ceresoli@comelit.it> X-OriginalArrivalTime: 11 May 2011 14:00:38.0163 (UTC) FILETIME=[CE652630:01CC0FE3] X-TM-AS-Product-Ver: SMEX-8.6.0.1168-6.500.1024-18128.004 X-TM-AS-Result: No--4.433700-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Luca Ceresoli , biggerbadderben@gmail.com Subject: [U-Boot] [PATCH v2 5/8] net/net.c: cosmetic: fix pointer syntax issues X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This removes the following checkpatch issues: - ERROR: "foo * bar" should be "foo *bar" - ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Luca Ceresoli Cc: Wolfgang Denk Cc: Ben Warren Cc: Mike Frysinger --- Changes since v1: none. net/net.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) 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);