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

net: axi_emac: Fix parentheses around operand !


Fix these compilation warning by proper grouping:
In function 'axi_dma_init': drivers/net/xilinx_axi_emac.c:391:7:
warning: suggest parentheses around operand of '!' or change '&' to '&&'
or '!' to '~' [-Wparentheses]
    if (!(in_be32(&priv->dmatx->control) |
        ^
In function 'axiemac_send': drivers/net/xilinx_axi_emac.c:501:21:
warning: suggest parentheses around operand of '!' or change '&' to '&&'
or '!' to '~' [-Wparentheses]
  while (timeout && (!in_be32(&priv->dmatx->status) &

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Acked-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
parent 2014a3de
No related branches found
No related tags found
No related merge requests found
...@@ -388,9 +388,9 @@ static void axi_dma_init(struct eth_device *dev) ...@@ -388,9 +388,9 @@ static void axi_dma_init(struct eth_device *dev)
while (timeout--) { while (timeout--) {
/* Check transmit/receive channel */ /* Check transmit/receive channel */
/* Reset is done when the reset bit is low */ /* Reset is done when the reset bit is low */
if (!(in_be32(&priv->dmatx->control) | if (!((in_be32(&priv->dmatx->control) |
in_be32(&priv->dmarx->control)) in_be32(&priv->dmarx->control))
& XAXIDMA_CR_RESET_MASK) { & XAXIDMA_CR_RESET_MASK)) {
break; break;
} }
} }
...@@ -498,8 +498,8 @@ static int axiemac_send(struct eth_device *dev, void *ptr, int len) ...@@ -498,8 +498,8 @@ static int axiemac_send(struct eth_device *dev, void *ptr, int len)
/* Wait for transmission to complete */ /* Wait for transmission to complete */
debug("axiemac: Waiting for tx to be done\n"); debug("axiemac: Waiting for tx to be done\n");
timeout = 200; timeout = 200;
while (timeout && (!in_be32(&priv->dmatx->status) & while (timeout && (!(in_be32(&priv->dmatx->status) &
(XAXIDMA_IRQ_DELAY_MASK | XAXIDMA_IRQ_IOC_MASK))) { (XAXIDMA_IRQ_DELAY_MASK | XAXIDMA_IRQ_IOC_MASK)))) {
timeout--; timeout--;
udelay(1); udelay(1);
} }
......
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