aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tehuti.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-02-15 03:34:24 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-16 18:45:44 -0500
commit249658d5c24e42f19b3721b654d64a46816e9b0e (patch)
treee9aeb0e2fd5f798e536b01f28b70f7687a652569 /drivers/net/tehuti.c
parentcb001a1f7db6ffb0fff0796c60853c2bf2e512c3 (diff)
drivers/net/tehuti.c: trivial checkpatch cleanups
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tehuti.c')
-rw-r--r--drivers/net/tehuti.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index fdf87ea7bc4e..b295b926bc45 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -419,7 +419,7 @@ static int bdx_hw_start(struct bdx_priv *priv)
419 WRITE_REG(priv, regGMAC_RXF_A, GMAC_RX_FILTER_OSEN | 419 WRITE_REG(priv, regGMAC_RXF_A, GMAC_RX_FILTER_OSEN |
420 GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB); 420 GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB);
421 421
422#define BDX_IRQ_TYPE ((priv->nic->irq_type == IRQ_MSI)?0:IRQF_SHARED) 422#define BDX_IRQ_TYPE ((priv->nic->irq_type == IRQ_MSI) ? 0 : IRQF_SHARED)
423 423
424 rc = request_irq(priv->pdev->irq, bdx_isr_napi, BDX_IRQ_TYPE, 424 rc = request_irq(priv->pdev->irq, bdx_isr_napi, BDX_IRQ_TYPE,
425 ndev->name, ndev); 425 ndev->name, ndev);
@@ -1605,7 +1605,7 @@ static inline int bdx_tx_space(struct bdx_priv *priv)
1605 fsize = f->m.rptr - f->m.wptr; 1605 fsize = f->m.rptr - f->m.wptr;
1606 if (fsize <= 0) 1606 if (fsize <= 0)
1607 fsize = f->m.memsz + fsize; 1607 fsize = f->m.memsz + fsize;
1608 return (fsize); 1608 return fsize;
1609} 1609}
1610 1610
1611/* bdx_tx_transmit - send packet to NIC 1611/* bdx_tx_transmit - send packet to NIC
@@ -2295,13 +2295,13 @@ bdx_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecoal)
2295/* Convert RX fifo size to number of pending packets */ 2295/* Convert RX fifo size to number of pending packets */
2296static inline int bdx_rx_fifo_size_to_packets(int rx_size) 2296static inline int bdx_rx_fifo_size_to_packets(int rx_size)
2297{ 2297{
2298 return ((FIFO_SIZE * (1 << rx_size)) / sizeof(struct rxf_desc)); 2298 return (FIFO_SIZE * (1 << rx_size)) / sizeof(struct rxf_desc);
2299} 2299}
2300 2300
2301/* Convert TX fifo size to number of pending packets */ 2301/* Convert TX fifo size to number of pending packets */
2302static inline int bdx_tx_fifo_size_to_packets(int tx_size) 2302static inline int bdx_tx_fifo_size_to_packets(int tx_size)
2303{ 2303{
2304 return ((FIFO_SIZE * (1 << tx_size)) / BDX_TXF_DESC_SZ); 2304 return (FIFO_SIZE * (1 << tx_size)) / BDX_TXF_DESC_SZ;
2305} 2305}
2306 2306
2307/* 2307/*
@@ -2393,10 +2393,10 @@ static int bdx_get_sset_count(struct net_device *netdev, int stringset)
2393 case ETH_SS_STATS: 2393 case ETH_SS_STATS:
2394 BDX_ASSERT(ARRAY_SIZE(bdx_stat_names) 2394 BDX_ASSERT(ARRAY_SIZE(bdx_stat_names)
2395 != sizeof(struct bdx_stats) / sizeof(u64)); 2395 != sizeof(struct bdx_stats) / sizeof(u64));
2396 return ((priv->stats_flag) ? ARRAY_SIZE(bdx_stat_names) : 0); 2396 return (priv->stats_flag) ? ARRAY_SIZE(bdx_stat_names) : 0;
2397 default:
2398 return -EINVAL;
2399 } 2397 }
2398
2399 return -EINVAL;
2400} 2400}
2401 2401
2402/* 2402/*