From patchwork Tue May 22 22:18:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Linz X-Patchwork-Id: 160755 X-Patchwork-Delegate: joe.hershberger@gmail.com 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 D26E5B6FA8 for ; Wed, 23 May 2012 08:18:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E5885280A5; Wed, 23 May 2012 00:18:40 +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 qNnwumdyLBx2; Wed, 23 May 2012 00:18:40 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D938328099; Wed, 23 May 2012 00:18:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6181928087 for ; Wed, 23 May 2012 00:18:24 +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 GJ2Le7nyTJ0S for ; Wed, 23 May 2012 00:18:23 +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 mo-p00-ob.rzone.de (mo-p00-ob.rzone.de [81.169.146.160]) by theia.denx.de (Postfix) with ESMTPS id 18E3D28085 for ; Wed, 23 May 2012 00:18:21 +0200 (CEST) X-RZG-AUTH: :IGUKb2CkcrLHmZv+FHarxbxlXmJO7WRQLa+vsyW+4RLunWeioNrxLvcBFZxa X-RZG-CLASS-ID: mo00 Received: from localhost.localdomain (i588283BB.versanet.de [88.130.131.187]) by smtp.strato.de (jored mo63) (RZmta 29.7 DYNA|AUTH) with ESMTPA id 2003c0o4MJmYOo ; Wed, 23 May 2012 00:18:17 +0200 (CEST) From: Stephan Linz To: u-boot@lists.denx.de Date: Wed, 23 May 2012 00:18:09 +0200 Message-Id: <1337725091-8342-1-git-send-email-linz@li-pro.net> X-Mailer: git-send-email 1.7.0.4 Cc: Stephan Linz , joe.hershberger@ni.com Subject: [U-Boot] [PATCH] drivers/net/xilinx_ll_temac.c: Fix compile warning X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 Fix this: xilinx_ll_temac.c: In function 'xilinx_ll_temac_initialize': xilinx_ll_temac.c:332: warning: assignment from incompatible pointer type xilinx_ll_temac.c:340: warning: assignment from incompatible pointer type Signed-off-by: Stephan Linz --- drivers/net/xilinx_ll_temac_fifo.c | 3 +-- drivers/net/xilinx_ll_temac_fifo.h | 3 +-- drivers/net/xilinx_ll_temac_sdma.c | 3 +-- drivers/net/xilinx_ll_temac_sdma.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/xilinx_ll_temac_fifo.c b/drivers/net/xilinx_ll_temac_fifo.c index 3ff0f34..d7fd989 100644 --- a/drivers/net/xilinx_ll_temac_fifo.c +++ b/drivers/net/xilinx_ll_temac_fifo.c @@ -102,8 +102,7 @@ int ll_temac_recv_fifo(struct eth_device *dev) return 0; } -int ll_temac_send_fifo(struct eth_device *dev, volatile void *packet, - int length) +int ll_temac_send_fifo(struct eth_device *dev, void *packet, int length) { int i; u32 *buf = (u32 *)packet; diff --git a/drivers/net/xilinx_ll_temac_fifo.h b/drivers/net/xilinx_ll_temac_fifo.h index f0d6e68..e5b4be9 100644 --- a/drivers/net/xilinx_ll_temac_fifo.h +++ b/drivers/net/xilinx_ll_temac_fifo.h @@ -116,7 +116,6 @@ int ll_temac_reset_fifo(struct eth_device *dev); int ll_temac_recv_fifo(struct eth_device *dev); /* send buffered data to FIFO */ -int ll_temac_send_fifo(struct eth_device *dev, volatile void *packet, - int length); +int ll_temac_send_fifo(struct eth_device *dev, void *packet, int length); #endif /* _XILINX_LL_TEMAC_FIFO_ */ diff --git a/drivers/net/xilinx_ll_temac_sdma.c b/drivers/net/xilinx_ll_temac_sdma.c index 621d100..8637a6b 100644 --- a/drivers/net/xilinx_ll_temac_sdma.c +++ b/drivers/net/xilinx_ll_temac_sdma.c @@ -324,8 +324,7 @@ int ll_temac_recv_sdma(struct eth_device *dev) return 0; } -int ll_temac_send_sdma(struct eth_device *dev, volatile void *packet, - int length) +int ll_temac_send_sdma(struct eth_device *dev, void *packet, int length) { unsigned timeout = 50; /* 1usec * 50 = 50usec */ struct cdmac_bd *tx_dp = &cdmac_bd.tx[tx_idx]; diff --git a/drivers/net/xilinx_ll_temac_sdma.h b/drivers/net/xilinx_ll_temac_sdma.h index 51e258d..db00a57 100644 --- a/drivers/net/xilinx_ll_temac_sdma.h +++ b/drivers/net/xilinx_ll_temac_sdma.h @@ -275,7 +275,6 @@ int ll_temac_reset_sdma(struct eth_device *dev); int ll_temac_recv_sdma(struct eth_device *dev); /* send buffered data to SDMA */ -int ll_temac_send_sdma(struct eth_device *dev, volatile void *packet, - int length); +int ll_temac_send_sdma(struct eth_device *dev, void *packet, int length); #endif /* _XILINX_LL_TEMAC_SDMA_ */