mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
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>
This commit is contained in:
parent
02cc343b83
commit
12d4f96448
@ -229,7 +229,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
|
||||
writel(ctl, &etdev->regs->txmac.ctl);
|
||||
|
||||
/* Ready to start the RXDMA/TXDMA engine */
|
||||
if (etdev->Flags & fMP_ADAPTER_LOWER_POWER) {
|
||||
if (etdev->flags & fMP_ADAPTER_LOWER_POWER) {
|
||||
et131x_rx_dma_enable(etdev);
|
||||
et131x_tx_dma_enable(etdev);
|
||||
}
|
||||
|
@ -121,7 +121,7 @@ void EnablePhyComa(struct et131x_adapter *etdev)
|
||||
|
||||
/* Stop sending packets. */
|
||||
spin_lock_irqsave(&etdev->send_hw_lock, flags);
|
||||
etdev->Flags |= fMP_ADAPTER_LOWER_POWER;
|
||||
etdev->flags |= fMP_ADAPTER_LOWER_POWER;
|
||||
spin_unlock_irqrestore(&etdev->send_hw_lock, flags);
|
||||
|
||||
/* Wait for outstanding Receive packets */
|
||||
@ -172,7 +172,7 @@ void DisablePhyComa(struct et131x_adapter *etdev)
|
||||
et131x_adapter_setup(etdev);
|
||||
|
||||
/* Allow Tx to restart */
|
||||
etdev->Flags &= ~fMP_ADAPTER_LOWER_POWER;
|
||||
etdev->flags &= ~fMP_ADAPTER_LOWER_POWER;
|
||||
|
||||
/* Need to re-enable Rx. */
|
||||
et131x_rx_dma_enable(etdev);
|
||||
|
@ -394,7 +394,7 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
|
||||
SLAB_HWCACHE_ALIGN,
|
||||
NULL);
|
||||
|
||||
adapter->Flags |= fMP_ADAPTER_RECV_LOOKASIDE;
|
||||
adapter->flags |= fMP_ADAPTER_RECV_LOOKASIDE;
|
||||
|
||||
/* The RFDs are going to be put on lists later on, so initialize the
|
||||
* lists now.
|
||||
@ -528,9 +528,9 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
|
||||
/* Free receive packet pool */
|
||||
|
||||
/* Destroy the lookaside (RFD) pool */
|
||||
if (adapter->Flags & fMP_ADAPTER_RECV_LOOKASIDE) {
|
||||
if (adapter->flags & fMP_ADAPTER_RECV_LOOKASIDE) {
|
||||
kmem_cache_destroy(rx_ring->RecvLookaside);
|
||||
adapter->Flags &= ~fMP_ADAPTER_RECV_LOOKASIDE;
|
||||
adapter->flags &= ~fMP_ADAPTER_RECV_LOOKASIDE;
|
||||
}
|
||||
|
||||
/* Free the FBR Lookup Table */
|
||||
|
@ -307,7 +307,7 @@ int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)
|
||||
/* We need to see if the link is up; if it's not, make the
|
||||
* netif layer think we're good and drop the packet
|
||||
*/
|
||||
if ((etdev->Flags & fMP_ADAPTER_FAIL_SEND_MASK) ||
|
||||
if ((etdev->flags & fMP_ADAPTER_FAIL_SEND_MASK) ||
|
||||
!netif_carrier_ok(netdev)) {
|
||||
dev_kfree_skb_any(skb);
|
||||
skb = NULL;
|
||||
|
@ -150,7 +150,7 @@ struct et131x_adapter {
|
||||
struct work_struct task;
|
||||
|
||||
/* Flags that indicate current state of the adapter */
|
||||
u32 Flags;
|
||||
u32 flags;
|
||||
u32 HwErrCount;
|
||||
|
||||
/* Configuration */
|
||||
|
@ -162,7 +162,7 @@ int et131x_open(struct net_device *netdev)
|
||||
/* Enable device interrupts */
|
||||
et131x_enable_interrupts(adapter);
|
||||
|
||||
adapter->Flags |= fMP_ADAPTER_INTERRUPT_IN_USE;
|
||||
adapter->flags |= fMP_ADAPTER_INTERRUPT_IN_USE;
|
||||
|
||||
/* We're ready to move some data, so start the queue */
|
||||
netif_start_queue(netdev);
|
||||
@ -190,7 +190,7 @@ int et131x_close(struct net_device *netdev)
|
||||
et131x_disable_interrupts(adapter);
|
||||
|
||||
/* Deregistering ISR */
|
||||
adapter->Flags &= ~fMP_ADAPTER_INTERRUPT_IN_USE;
|
||||
adapter->flags &= ~fMP_ADAPTER_INTERRUPT_IN_USE;
|
||||
free_irq(netdev->irq, netdev);
|
||||
|
||||
/* Stop the error timer */
|
||||
@ -449,11 +449,11 @@ void et131x_tx_timeout(struct net_device *netdev)
|
||||
/* Any nonrecoverable hardware error?
|
||||
* Checks adapter->flags for any failure in phy reading
|
||||
*/
|
||||
if (etdev->Flags & fMP_ADAPTER_NON_RECOVER_ERROR)
|
||||
if (etdev->flags & fMP_ADAPTER_NON_RECOVER_ERROR)
|
||||
return;
|
||||
|
||||
/* Hardware failure? */
|
||||
if (etdev->Flags & fMP_ADAPTER_HARDWARE_ERROR) {
|
||||
if (etdev->flags & fMP_ADAPTER_HARDWARE_ERROR) {
|
||||
dev_err(&etdev->pdev->dev, "hardware error - reset\n");
|
||||
return;
|
||||
}
|
||||
@ -471,7 +471,7 @@ void et131x_tx_timeout(struct net_device *netdev)
|
||||
flags);
|
||||
|
||||
dev_warn(&etdev->pdev->dev,
|
||||
"Send stuck - reset. tcb->WrIndex %x, Flags 0x%08x\n",
|
||||
"Send stuck - reset. tcb->WrIndex %x, flags 0x%08x\n",
|
||||
tcb->index,
|
||||
tcb->flags);
|
||||
|
||||
@ -540,7 +540,7 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu)
|
||||
et131x_adapter_setup(adapter);
|
||||
|
||||
/* Enable interrupts */
|
||||
if (adapter->Flags & fMP_ADAPTER_INTERRUPT_IN_USE)
|
||||
if (adapter->flags & fMP_ADAPTER_INTERRUPT_IN_USE)
|
||||
et131x_enable_interrupts(adapter);
|
||||
|
||||
/* Restart the Tx and Rx DMA engines */
|
||||
@ -622,7 +622,7 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
|
||||
et131x_adapter_setup(adapter);
|
||||
|
||||
/* Enable interrupts */
|
||||
if (adapter->Flags & fMP_ADAPTER_INTERRUPT_IN_USE)
|
||||
if (adapter->flags & fMP_ADAPTER_INTERRUPT_IN_USE)
|
||||
et131x_enable_interrupts(adapter);
|
||||
|
||||
/* Restart the Tx and Rx DMA engines */
|
||||
|
Loading…
Reference in New Issue
Block a user