diff options
author | Guo-Fu Tseng <cooldavid@cooldavid.org> | 2009-07-06 00:36:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-06 16:04:56 -0400 |
commit | eacf69a156dd068b3dfaa0aeb4874cda8633de87 (patch) | |
tree | da0c016a66ad282bf5bfb2b8c7cf145e1d323464 | |
parent | ec634fe328182a1a098585bfc7b69e5042bdb08d (diff) |
jme: Some minor coding style consistency modifications
Making coding style more consistent.
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/jme.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 1e3c63d67b91..abf82cd2d7c3 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
@@ -554,7 +554,7 @@ jme_free_tx_resources(struct jme_adapter *jme) | |||
554 | { | 554 | { |
555 | int i; | 555 | int i; |
556 | struct jme_ring *txring = &(jme->txring[0]); | 556 | struct jme_ring *txring = &(jme->txring[0]); |
557 | struct jme_buffer_info *txbi = txring->bufinf; | 557 | struct jme_buffer_info *txbi; |
558 | 558 | ||
559 | if (txring->alloc) { | 559 | if (txring->alloc) { |
560 | for (i = 0 ; i < jme->tx_ring_size ; ++i) { | 560 | for (i = 0 ; i < jme->tx_ring_size ; ++i) { |
@@ -653,7 +653,7 @@ jme_disable_tx_engine(struct jme_adapter *jme) | |||
653 | static void | 653 | static void |
654 | jme_set_clean_rxdesc(struct jme_adapter *jme, int i) | 654 | jme_set_clean_rxdesc(struct jme_adapter *jme, int i) |
655 | { | 655 | { |
656 | struct jme_ring *rxring = jme->rxring; | 656 | struct jme_ring *rxring = &(jme->rxring[0]); |
657 | register struct rxdesc *rxdesc = rxring->desc; | 657 | register struct rxdesc *rxdesc = rxring->desc; |
658 | struct jme_buffer_info *rxbi = rxring->bufinf; | 658 | struct jme_buffer_info *rxbi = rxring->bufinf; |
659 | rxdesc += i; | 659 | rxdesc += i; |
@@ -790,9 +790,9 @@ jme_enable_rx_engine(struct jme_adapter *jme) | |||
790 | /* | 790 | /* |
791 | * Setup RX DMA Bass Address | 791 | * Setup RX DMA Bass Address |
792 | */ | 792 | */ |
793 | jwrite32(jme, JME_RXDBA_LO, (__u64)jme->rxring[0].dma & 0xFFFFFFFFUL); | 793 | jwrite32(jme, JME_RXDBA_LO, (__u64)(jme->rxring[0].dma) & 0xFFFFFFFFUL); |
794 | jwrite32(jme, JME_RXDBA_HI, (__u64)(jme->rxring[0].dma) >> 32); | 794 | jwrite32(jme, JME_RXDBA_HI, (__u64)(jme->rxring[0].dma) >> 32); |
795 | jwrite32(jme, JME_RXNDA, (__u64)jme->rxring[0].dma & 0xFFFFFFFFUL); | 795 | jwrite32(jme, JME_RXNDA, (__u64)(jme->rxring[0].dma) & 0xFFFFFFFFUL); |
796 | 796 | ||
797 | /* | 797 | /* |
798 | * Setup RX Descriptor Count | 798 | * Setup RX Descriptor Count |
@@ -1296,7 +1296,7 @@ jme_rx_empty_tasklet(unsigned long arg) | |||
1296 | static void | 1296 | static void |
1297 | jme_wake_queue_if_stopped(struct jme_adapter *jme) | 1297 | jme_wake_queue_if_stopped(struct jme_adapter *jme) |
1298 | { | 1298 | { |
1299 | struct jme_ring *txring = jme->txring; | 1299 | struct jme_ring *txring = &(jme->txring[0]); |
1300 | 1300 | ||
1301 | smp_wmb(); | 1301 | smp_wmb(); |
1302 | if (unlikely(netif_queue_stopped(jme->dev) && | 1302 | if (unlikely(netif_queue_stopped(jme->dev) && |
@@ -1668,7 +1668,7 @@ static int | |||
1668 | jme_alloc_txdesc(struct jme_adapter *jme, | 1668 | jme_alloc_txdesc(struct jme_adapter *jme, |
1669 | struct sk_buff *skb) | 1669 | struct sk_buff *skb) |
1670 | { | 1670 | { |
1671 | struct jme_ring *txring = jme->txring; | 1671 | struct jme_ring *txring = &(jme->txring[0]); |
1672 | int idx, nr_alloc, mask = jme->tx_ring_mask; | 1672 | int idx, nr_alloc, mask = jme->tx_ring_mask; |
1673 | 1673 | ||
1674 | idx = txring->next_to_use; | 1674 | idx = txring->next_to_use; |
@@ -1722,7 +1722,7 @@ jme_fill_tx_map(struct pci_dev *pdev, | |||
1722 | static void | 1722 | static void |
1723 | jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) | 1723 | jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) |
1724 | { | 1724 | { |
1725 | struct jme_ring *txring = jme->txring; | 1725 | struct jme_ring *txring = &(jme->txring[0]); |
1726 | struct txdesc *txdesc = txring->desc, *ctxdesc; | 1726 | struct txdesc *txdesc = txring->desc, *ctxdesc; |
1727 | struct jme_buffer_info *txbi = txring->bufinf, *ctxbi; | 1727 | struct jme_buffer_info *txbi = txring->bufinf, *ctxbi; |
1728 | u8 hidma = jme->dev->features & NETIF_F_HIGHDMA; | 1728 | u8 hidma = jme->dev->features & NETIF_F_HIGHDMA; |
@@ -1835,7 +1835,7 @@ jme_tx_vlan(struct sk_buff *skb, __le16 *vlan, u8 *flags) | |||
1835 | static int | 1835 | static int |
1836 | jme_fill_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx) | 1836 | jme_fill_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx) |
1837 | { | 1837 | { |
1838 | struct jme_ring *txring = jme->txring; | 1838 | struct jme_ring *txring = &(jme->txring[0]); |
1839 | struct txdesc *txdesc; | 1839 | struct txdesc *txdesc; |
1840 | struct jme_buffer_info *txbi; | 1840 | struct jme_buffer_info *txbi; |
1841 | u8 flags; | 1841 | u8 flags; |
@@ -1883,7 +1883,7 @@ jme_fill_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx) | |||
1883 | static void | 1883 | static void |
1884 | jme_stop_queue_if_full(struct jme_adapter *jme) | 1884 | jme_stop_queue_if_full(struct jme_adapter *jme) |
1885 | { | 1885 | { |
1886 | struct jme_ring *txring = jme->txring; | 1886 | struct jme_ring *txring = &(jme->txring[0]); |
1887 | struct jme_buffer_info *txbi = txring->bufinf; | 1887 | struct jme_buffer_info *txbi = txring->bufinf; |
1888 | int idx = atomic_read(&txring->next_to_clean); | 1888 | int idx = atomic_read(&txring->next_to_clean); |
1889 | 1889 | ||