lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jme: Some minor coding style consistency modifications

Browse Source 
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>
This commit is contained in:
Guo-Fu Tseng
2009-07-06 04:36:30 +00:00
committed by David S. Miller
parent ec634fe328
commit eacf69a156
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/jme.c
View File

@@ -554,7 +554,7 @@ jme_free_tx_resources(struct jme_adapter *jme)
{ {
int i; int i;
struct jme_ring *txring = &(jme->txring[0]); struct jme_ring *txring = &(jme->txring[0]);
struct jme_buffer_info *txbi = txring->bufinf; struct jme_buffer_info *txbi;
if (txring->alloc) { if (txring->alloc) {
for (i = 0 ; i < jme->tx_ring_size ; ++i) { for (i = 0 ; i < jme->tx_ring_size ; ++i) {
@@ -653,7 +653,7 @@ jme_disable_tx_engine(struct jme_adapter *jme)
static void static void
jme_set_clean_rxdesc(struct jme_adapter *jme, int i) jme_set_clean_rxdesc(struct jme_adapter *jme, int i)
{ {
struct jme_ring *rxring = jme->rxring; struct jme_ring *rxring = &(jme->rxring[0]);
register struct rxdesc *rxdesc = rxring->desc; register struct rxdesc *rxdesc = rxring->desc;
struct jme_buffer_info *rxbi = rxring->bufinf; struct jme_buffer_info *rxbi = rxring->bufinf;
rxdesc += i; rxdesc += i;
@@ -790,9 +790,9 @@ jme_enable_rx_engine(struct jme_adapter *jme)
/* /*
* Setup RX DMA Bass Address * Setup RX DMA Bass Address
*/ */
jwrite32(jme, JME_RXDBA_LO, (__u64)jme->rxring[0].dma & 0xFFFFFFFFUL); jwrite32(jme, JME_RXDBA_LO, (__u64)(jme->rxring[0].dma) & 0xFFFFFFFFUL);
jwrite32(jme, JME_RXDBA_HI, (__u64)(jme->rxring[0].dma) >> 32); jwrite32(jme, JME_RXDBA_HI, (__u64)(jme->rxring[0].dma) >> 32);
jwrite32(jme, JME_RXNDA, (__u64)jme->rxring[0].dma & 0xFFFFFFFFUL); jwrite32(jme, JME_RXNDA, (__u64)(jme->rxring[0].dma) & 0xFFFFFFFFUL);
/* /*
* Setup RX Descriptor Count * Setup RX Descriptor Count
@@ -1296,7 +1296,7 @@ jme_rx_empty_tasklet(unsigned long arg)
static void static void
jme_wake_queue_if_stopped(struct jme_adapter *jme) jme_wake_queue_if_stopped(struct jme_adapter *jme)
{ {
struct jme_ring *txring = jme->txring; struct jme_ring *txring = &(jme->txring[0]);
smp_wmb(); smp_wmb();
if (unlikely(netif_queue_stopped(jme->dev) && if (unlikely(netif_queue_stopped(jme->dev) &&
@@ -1668,7 +1668,7 @@ static int
jme_alloc_txdesc(struct jme_adapter *jme, jme_alloc_txdesc(struct jme_adapter *jme,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct jme_ring *txring = jme->txring; struct jme_ring *txring = &(jme->txring[0]);
int idx, nr_alloc, mask = jme->tx_ring_mask; int idx, nr_alloc, mask = jme->tx_ring_mask;
idx = txring->next_to_use; idx = txring->next_to_use;
@@ -1722,7 +1722,7 @@ jme_fill_tx_map(struct pci_dev *pdev,
static void static void
jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx)
{ {
struct jme_ring *txring = jme->txring; struct jme_ring *txring = &(jme->txring[0]);
struct txdesc *txdesc = txring->desc, *ctxdesc; struct txdesc *txdesc = txring->desc, *ctxdesc;
struct jme_buffer_info *txbi = txring->bufinf, *ctxbi; struct jme_buffer_info *txbi = txring->bufinf, *ctxbi;
u8 hidma = jme->dev->features & NETIF_F_HIGHDMA; u8 hidma = jme->dev->features & NETIF_F_HIGHDMA;
@@ -1835,7 +1835,7 @@ jme_tx_vlan(struct sk_buff *skb, __le16 *vlan, u8 *flags)
static int static int
jme_fill_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx) jme_fill_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx)
{ {
struct jme_ring *txring = jme->txring; struct jme_ring *txring = &(jme->txring[0]);
struct txdesc *txdesc; struct txdesc *txdesc;
struct jme_buffer_info *txbi; struct jme_buffer_info *txbi;
u8 flags; u8 flags;
@@ -1883,7 +1883,7 @@ jme_fill_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx)
static void static void
jme_stop_queue_if_full(struct jme_adapter *jme) jme_stop_queue_if_full(struct jme_adapter *jme)
{ {
struct jme_ring *txring = jme->txring; struct jme_ring *txring = &(jme->txring[0]);
struct jme_buffer_info *txbi = txring->bufinf; struct jme_buffer_info *txbi = txring->bufinf;
int idx = atomic_read(&txring->next_to_clean); int idx = atomic_read(&txring->next_to_clean);