From 4f1a2684cecd13037c8a715ed8090797b9689cb3 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 24 Sep 2012 11:21:28 +0200 Subject: [PATCH] net: Gem driver - fix compilation error Error log: zynq_gem_wrap.c: In function 'zynq_gem_initialize': zynq_gem_wrap.c:544:12: warning: assignment from incompatible pointer type [enabled by default] Signed-off-by: Michal Simek --- drivers/net/zynq_gem_wrap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/zynq_gem_wrap.c b/drivers/net/zynq_gem_wrap.c index 158043d907a..9547d921047 100644 --- a/drivers/net/zynq_gem_wrap.c +++ b/drivers/net/zynq_gem_wrap.c @@ -407,7 +407,7 @@ void Xgmac_halt(struct eth_device *dev) return; } -int Xgmac_send(struct eth_device *dev, volatile void *packet, int length) +int Xgmac_send(struct eth_device *dev, void *packet, int length) { volatile int Status; XEmacPss_Bd *BdPtr; @@ -501,7 +501,7 @@ int Xgmac_rx(struct eth_device *dev) if (status & XEMACPSS_RXSR_FRAMERX_MASK) { // printf("rx packet received\n"); - + do { retval = Xgmac_process_rx(EmacPssInstancePtr); } while (retval == 0) ; @@ -511,7 +511,7 @@ int Xgmac_rx(struct eth_device *dev) */ XEmacPss_WriteReg(EmacPssInstancePtr->Config.BaseAddress, XEMACPSS_RXSR_OFFSET, status); - + return 1; } -- 2.47.3