iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: bcmgenet: modify Tx ring int_enable and int_disable vectors

Browse Source 
Remove unnecessary function parameter priv. Use ring->priv instead.

Signed-off-by: Petri Gynther <pgynther@google.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Petri Gynther 2015-03-25 12:35:10 -07:00 committed by David S. Miller
parent e412b1045c
commit 9dbac28fc1
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/ethernet/broadcom/genet/bcmgenet.c
View File

@ -964,33 +964,29 @@ static void bcmgenet_free_cb(struct enet_cb *cb)
dma_unmap_addr_set(cb, dma_addr, 0); dma_unmap_addr_set(cb, dma_addr, 0);
} }
static inline void bcmgenet_tx_ring16_int_disable(struct bcmgenet_priv *priv, static inline void bcmgenet_tx_ring16_int_disable(struct bcmgenet_tx_ring *ring)
struct bcmgenet_tx_ring *ring)
{ {
bcmgenet_intrl2_0_writel(priv, bcmgenet_intrl2_0_writel(ring->priv,
UMAC_IRQ_TXDMA_BDONE | UMAC_IRQ_TXDMA_PDONE, UMAC_IRQ_TXDMA_BDONE | UMAC_IRQ_TXDMA_PDONE,
INTRL2_CPU_MASK_SET); INTRL2_CPU_MASK_SET);
} }
static inline void bcmgenet_tx_ring16_int_enable(struct bcmgenet_priv *priv, static inline void bcmgenet_tx_ring16_int_enable(struct bcmgenet_tx_ring *ring)
struct bcmgenet_tx_ring *ring)
{ {
bcmgenet_intrl2_0_writel(priv, bcmgenet_intrl2_0_writel(ring->priv,
UMAC_IRQ_TXDMA_BDONE | UMAC_IRQ_TXDMA_PDONE, UMAC_IRQ_TXDMA_BDONE | UMAC_IRQ_TXDMA_PDONE,
INTRL2_CPU_MASK_CLEAR); INTRL2_CPU_MASK_CLEAR);
} }
static inline void bcmgenet_tx_ring_int_enable(struct bcmgenet_priv *priv, static inline void bcmgenet_tx_ring_int_enable(struct bcmgenet_tx_ring *ring)
struct bcmgenet_tx_ring *ring)
{ {
bcmgenet_intrl2_1_writel(priv, (1 << ring->index), bcmgenet_intrl2_1_writel(ring->priv, 1 << ring->index,
INTRL2_CPU_MASK_CLEAR); INTRL2_CPU_MASK_CLEAR);
} }
static inline void bcmgenet_tx_ring_int_disable(struct bcmgenet_priv *priv, static inline void bcmgenet_tx_ring_int_disable(struct bcmgenet_tx_ring *ring)
struct bcmgenet_tx_ring *ring)
{ {
bcmgenet_intrl2_1_writel(priv, (1 << ring->index), bcmgenet_intrl2_1_writel(ring->priv, 1 << ring->index,
INTRL2_CPU_MASK_SET); INTRL2_CPU_MASK_SET);
} }
@ -1083,7 +1079,7 @@ static int bcmgenet_tx_poll(struct napi_struct *napi, int budget)
if (work_done == 0) { if (work_done == 0) {
napi_complete(napi); napi_complete(napi);
ring->int_enable(ring->priv, ring); ring->int_enable(ring);
return 0; return 0;
} }
@ -2172,7 +2168,7 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id)
ring = &priv->tx_rings[index]; ring = &priv->tx_rings[index];
if (likely(napi_schedule_prep(&ring->napi))) { if (likely(napi_schedule_prep(&ring->napi))) {
ring->int_disable(priv, ring); ring->int_disable(ring);
__napi_schedule(&ring->napi); __napi_schedule(&ring->napi);
} }
} }
@ -2211,7 +2207,7 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id)
struct bcmgenet_tx_ring *ring = &priv->tx_rings[DESC_INDEX]; struct bcmgenet_tx_ring *ring = &priv->tx_rings[DESC_INDEX];
if (likely(napi_schedule_prep(&ring->napi))) { if (likely(napi_schedule_prep(&ring->napi))) {
ring->int_disable(priv, ring); ring->int_disable(ring);
__napi_schedule(&ring->napi); __napi_schedule(&ring->napi);
} }
} }

6
drivers/net/ethernet/broadcom/genet/bcmgenet.h
View File

@ -535,10 +535,8 @@ struct bcmgenet_tx_ring {
unsigned int prod_index; /* Tx ring producer index SW copy */ unsigned int prod_index; /* Tx ring producer index SW copy */
unsigned int cb_ptr; /* Tx ring initial CB ptr */ unsigned int cb_ptr; /* Tx ring initial CB ptr */
unsigned int end_ptr; /* Tx ring end CB ptr */ unsigned int end_ptr; /* Tx ring end CB ptr */
void (*int_enable)(struct bcmgenet_priv *priv, void (*int_enable)(struct bcmgenet_tx_ring *);
struct bcmgenet_tx_ring *); void (*int_disable)(struct bcmgenet_tx_ring *);
void (*int_disable)(struct bcmgenet_priv *priv,
struct bcmgenet_tx_ring *);
struct bcmgenet_priv *priv; struct bcmgenet_priv *priv;
}; };