Skip to content
Snippets Groups Projects
Commit f0985481 authored by Michal Simek's avatar Michal Simek
Browse files

net: axi_emac: Pass private structure where possible


Use axidma_priv instead of ethdevice in preparation of the DM move.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 0d78abf5
No related branches found
No related tags found
No related merge requests found
...@@ -315,9 +315,9 @@ static void axiemac_halt(struct eth_device *dev) ...@@ -315,9 +315,9 @@ static void axiemac_halt(struct eth_device *dev)
debug("axiemac: Halted\n"); debug("axiemac: Halted\n");
} }
static int axi_ethernet_init(struct eth_device *dev) static int axi_ethernet_init(struct axidma_priv *priv)
{ {
struct axi_regs *regs = (struct axi_regs *)dev->iobase; struct axi_regs *regs = priv->iobase;
u32 timeout = 200; u32 timeout = 200;
/* /*
...@@ -374,9 +374,8 @@ static int axiemac_setup_mac(struct eth_device *dev) ...@@ -374,9 +374,8 @@ static int axiemac_setup_mac(struct eth_device *dev)
} }
/* Reset DMA engine */ /* Reset DMA engine */
static void axi_dma_init(struct eth_device *dev) static void axi_dma_init(struct axidma_priv *priv)
{ {
struct axidma_priv *priv = dev->priv;
u32 timeout = 500; u32 timeout = 500;
/* Reset the engine so the hardware starts from a known state */ /* Reset the engine so the hardware starts from a known state */
...@@ -410,10 +409,10 @@ static int axiemac_init(struct eth_device *dev, bd_t * bis) ...@@ -410,10 +409,10 @@ static int axiemac_init(struct eth_device *dev, bd_t * bis)
* reset, and since AXIDMA reset line is connected to AxiEthernet, this * reset, and since AXIDMA reset line is connected to AxiEthernet, this
* would ensure a reset of AxiEthernet. * would ensure a reset of AxiEthernet.
*/ */
axi_dma_init(dev); axi_dma_init(priv);
/* Initialize AxiEthernet hardware. */ /* Initialize AxiEthernet hardware. */
if (axi_ethernet_init(dev)) if (axi_ethernet_init(priv))
return -1; return -1;
/* Disable all RX interrupts before RxBD space setup */ /* Disable all RX interrupts before RxBD space setup */
...@@ -511,10 +510,9 @@ static int axiemac_send(struct eth_device *dev, void *ptr, int len) ...@@ -511,10 +510,9 @@ static int axiemac_send(struct eth_device *dev, void *ptr, int len)
return 0; return 0;
} }
static int isrxready(struct eth_device *dev) static int isrxready(struct axidma_priv *priv)
{ {
u32 status; u32 status;
struct axidma_priv *priv = dev->priv;
/* Read pending interrupts */ /* Read pending interrupts */
status = in_be32(&priv->dmarx->status); status = in_be32(&priv->dmarx->status);
...@@ -539,7 +537,7 @@ static int axiemac_recv(struct eth_device *dev) ...@@ -539,7 +537,7 @@ static int axiemac_recv(struct eth_device *dev)
u32 temp; u32 temp;
/* Wait for an incoming packet */ /* Wait for an incoming packet */
if (!isrxready(dev)) if (!isrxready(priv))
return 0; return 0;
debug("axiemac: RX data ready\n"); debug("axiemac: RX data ready\n");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment