aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2011-07-07 17:59:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-08 17:06:36 -0400
commit12d4f964482e59f59b2064510d168fe83e91ff04 (patch)
treef3ddb73bd36fbd4b2972ab1c3e8e14a77e8bd3d9
parent02cc343b83a57824b83e1c30024ec9a84e5fb3a2 (diff)
staging: et131x: rename adapter->Flags to adapter->flags
Trivial rename of the adapter flags struct member to remove camel case. Tested on a ET-131x device. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/et131x/et1310_mac.c2
-rw-r--r--drivers/staging/et131x/et1310_pm.c4
-rw-r--r--drivers/staging/et131x/et1310_rx.c6
-rw-r--r--drivers/staging/et131x/et1310_tx.c2
-rw-r--r--drivers/staging/et131x/et131x_adapter.h2
-rw-r--r--drivers/staging/et131x/et131x_netdev.c14
6 files changed, 15 insertions, 15 deletions
diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c
index b1a7183e1b51..e6c243a1c68d 100644
--- a/drivers/staging/et131x/et1310_mac.c
+++ b/drivers/staging/et131x/et1310_mac.c
@@ -229,7 +229,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
229 writel(ctl, &etdev->regs->txmac.ctl); 229 writel(ctl, &etdev->regs->txmac.ctl);
230 230
231 /* Ready to start the RXDMA/TXDMA engine */ 231 /* Ready to start the RXDMA/TXDMA engine */
232 if (etdev->Flags & fMP_ADAPTER_LOWER_POWER) { 232 if (etdev->flags & fMP_ADAPTER_LOWER_POWER) {
233 et131x_rx_dma_enable(etdev); 233 et131x_rx_dma_enable(etdev);
234 et131x_tx_dma_enable(etdev); 234 et131x_tx_dma_enable(etdev);
235 } 235 }
diff --git a/drivers/staging/et131x/et1310_pm.c b/drivers/staging/et131x/et1310_pm.c
index 2bc19448d2e2..29d4d66d345f 100644
--- a/drivers/staging/et131x/et1310_pm.c
+++ b/drivers/staging/et131x/et1310_pm.c
@@ -121,7 +121,7 @@ void EnablePhyComa(struct et131x_adapter *etdev)
121 121
122 /* Stop sending packets. */ 122 /* Stop sending packets. */
123 spin_lock_irqsave(&etdev->send_hw_lock, flags); 123 spin_lock_irqsave(&etdev->send_hw_lock, flags);
124 etdev->Flags |= fMP_ADAPTER_LOWER_POWER; 124 etdev->flags |= fMP_ADAPTER_LOWER_POWER;
125 spin_unlock_irqrestore(&etdev->send_hw_lock, flags); 125 spin_unlock_irqrestore(&etdev->send_hw_lock, flags);
126 126
127 /* Wait for outstanding Receive packets */ 127 /* Wait for outstanding Receive packets */
@@ -172,7 +172,7 @@ void DisablePhyComa(struct et131x_adapter *etdev)
172 et131x_adapter_setup(etdev); 172 et131x_adapter_setup(etdev);
173 173
174 /* Allow Tx to restart */ 174 /* Allow Tx to restart */
175 etdev->Flags &= ~fMP_ADAPTER_LOWER_POWER; 175 etdev->flags &= ~fMP_ADAPTER_LOWER_POWER;
176 176
177 /* Need to re-enable Rx. */ 177 /* Need to re-enable Rx. */
178 et131x_rx_dma_enable(etdev); 178 et131x_rx_dma_enable(etdev);
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index fc90096f19c6..7e386e07ff97 100644
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -394,7 +394,7 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
394 SLAB_HWCACHE_ALIGN, 394 SLAB_HWCACHE_ALIGN,
395 NULL); 395 NULL);
396 396
397 adapter->Flags |= fMP_ADAPTER_RECV_LOOKASIDE; 397 adapter->flags |= fMP_ADAPTER_RECV_LOOKASIDE;
398 398
399 /* The RFDs are going to be put on lists later on, so initialize the 399 /* The RFDs are going to be put on lists later on, so initialize the
400 * lists now. 400 * lists now.
@@ -528,9 +528,9 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
528 /* Free receive packet pool */ 528 /* Free receive packet pool */
529 529
530 /* Destroy the lookaside (RFD) pool */ 530 /* Destroy the lookaside (RFD) pool */
531 if (adapter->Flags & fMP_ADAPTER_RECV_LOOKASIDE) { 531 if (adapter->flags & fMP_ADAPTER_RECV_LOOKASIDE) {
532 kmem_cache_destroy(rx_ring->RecvLookaside); 532 kmem_cache_destroy(rx_ring->RecvLookaside);
533 adapter->Flags &= ~fMP_ADAPTER_RECV_LOOKASIDE; 533 adapter->flags &= ~fMP_ADAPTER_RECV_LOOKASIDE;
534 } 534 }
535 535
536 /* Free the FBR Lookup Table */ 536 /* Free the FBR Lookup Table */
diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c
index bb67192270f1..8b1af64a55f0 100644
--- a/drivers/staging/et131x/et1310_tx.c
+++ b/drivers/staging/et131x/et1310_tx.c
@@ -307,7 +307,7 @@ int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)
307 /* We need to see if the link is up; if it's not, make the 307 /* We need to see if the link is up; if it's not, make the
308 * netif layer think we're good and drop the packet 308 * netif layer think we're good and drop the packet
309 */ 309 */
310 if ((etdev->Flags & fMP_ADAPTER_FAIL_SEND_MASK) || 310 if ((etdev->flags & fMP_ADAPTER_FAIL_SEND_MASK) ||
311 !netif_carrier_ok(netdev)) { 311 !netif_carrier_ok(netdev)) {
312 dev_kfree_skb_any(skb); 312 dev_kfree_skb_any(skb);
313 skb = NULL; 313 skb = NULL;
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index 39051dff6d3f..408c50ba4f2b 100644
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -150,7 +150,7 @@ struct et131x_adapter {
150 struct work_struct task; 150 struct work_struct task;
151 151
152 /* Flags that indicate current state of the adapter */ 152 /* Flags that indicate current state of the adapter */
153 u32 Flags; 153 u32 flags;
154 u32 HwErrCount; 154 u32 HwErrCount;
155 155
156 /* Configuration */ 156 /* Configuration */
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c
index 6bcddf1fe587..5f25bbad36b6 100644
--- a/drivers/staging/et131x/et131x_netdev.c
+++ b/drivers/staging/et131x/et131x_netdev.c
@@ -162,7 +162,7 @@ int et131x_open(struct net_device *netdev)
162 /* Enable device interrupts */ 162 /* Enable device interrupts */
163 et131x_enable_interrupts(adapter); 163 et131x_enable_interrupts(adapter);
164 164
165 adapter->Flags |= fMP_ADAPTER_INTERRUPT_IN_USE; 165 adapter->flags |= fMP_ADAPTER_INTERRUPT_IN_USE;
166 166
167 /* We're ready to move some data, so start the queue */ 167 /* We're ready to move some data, so start the queue */
168 netif_start_queue(netdev); 168 netif_start_queue(netdev);
@@ -190,7 +190,7 @@ int et131x_close(struct net_device *netdev)
190 et131x_disable_interrupts(adapter); 190 et131x_disable_interrupts(adapter);
191 191
192 /* Deregistering ISR */ 192 /* Deregistering ISR */
193 adapter->Flags &= ~fMP_ADAPTER_INTERRUPT_IN_USE; 193 adapter->flags &= ~fMP_ADAPTER_INTERRUPT_IN_USE;
194 free_irq(netdev->irq, netdev); 194 free_irq(netdev->irq, netdev);
195 195
196 /* Stop the error timer */ 196 /* Stop the error timer */
@@ -449,11 +449,11 @@ void et131x_tx_timeout(struct net_device *netdev)
449 /* Any nonrecoverable hardware error? 449 /* Any nonrecoverable hardware error?
450 * Checks adapter->flags for any failure in phy reading 450 * Checks adapter->flags for any failure in phy reading
451 */ 451 */
452 if (etdev->Flags & fMP_ADAPTER_NON_RECOVER_ERROR) 452 if (etdev->flags & fMP_ADAPTER_NON_RECOVER_ERROR)
453 return; 453 return;
454 454
455 /* Hardware failure? */ 455 /* Hardware failure? */
456 if (etdev->Flags & fMP_ADAPTER_HARDWARE_ERROR) { 456 if (etdev->flags & fMP_ADAPTER_HARDWARE_ERROR) {
457 dev_err(&etdev->pdev->dev, "hardware error - reset\n"); 457 dev_err(&etdev->pdev->dev, "hardware error - reset\n");
458 return; 458 return;
459 } 459 }
@@ -471,7 +471,7 @@ void et131x_tx_timeout(struct net_device *netdev)
471 flags); 471 flags);
472 472
473 dev_warn(&etdev->pdev->dev, 473 dev_warn(&etdev->pdev->dev,
474 "Send stuck - reset. tcb->WrIndex %x, Flags 0x%08x\n", 474 "Send stuck - reset. tcb->WrIndex %x, flags 0x%08x\n",
475 tcb->index, 475 tcb->index,
476 tcb->flags); 476 tcb->flags);
477 477
@@ -540,7 +540,7 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu)
540 et131x_adapter_setup(adapter); 540 et131x_adapter_setup(adapter);
541 541
542 /* Enable interrupts */ 542 /* Enable interrupts */
543 if (adapter->Flags & fMP_ADAPTER_INTERRUPT_IN_USE) 543 if (adapter->flags & fMP_ADAPTER_INTERRUPT_IN_USE)
544 et131x_enable_interrupts(adapter); 544 et131x_enable_interrupts(adapter);
545 545
546 /* Restart the Tx and Rx DMA engines */ 546 /* Restart the Tx and Rx DMA engines */
@@ -622,7 +622,7 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
622 et131x_adapter_setup(adapter); 622 et131x_adapter_setup(adapter);
623 623
624 /* Enable interrupts */ 624 /* Enable interrupts */
625 if (adapter->Flags & fMP_ADAPTER_INTERRUPT_IN_USE) 625 if (adapter->flags & fMP_ADAPTER_INTERRUPT_IN_USE)
626 et131x_enable_interrupts(adapter); 626 et131x_enable_interrupts(adapter);
627 627
628 /* Restart the Tx and Rx DMA engines */ 628 /* Restart the Tx and Rx DMA engines */