staging: et131x: rename adapter->Flags to adapter->flags
PATCH 1/2 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 <[email protected]>
--- drivers/staging/et131x/et1310_mac.c | 2 +- drivers/staging/et131x/et1310_pm.c | 4 ++-- drivers/staging/et131x/et1310_rx.c | 6 +++--- drivers/staging/et131x/et1310_tx.c | 2 +- drivers/staging/et131x/et131x_adapter.h | 2 +- drivers/staging/et131x/et131x_netdev.c | 14 +++++++------- 6 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/et131x/et1310_mac.c +1 -1
@@ -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); }
drivers/staging/et131x/et1310_pm.c +2 -2
@@ -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);
drivers/staging/et131x/et1310_rx.c +3 -3
@@ -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 */
drivers/staging/et131x/et1310_tx.c +1 -1
@@ -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 ;
drivers/staging/et131x/et131x_adapter.h +1 -1
@@ -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 */
drivers/staging/et131x/et131x_netdev.c +7 -7
@@ -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 */
Signature · 1 line
1.7.4.4
PATCH 2/2 staging: et131x: Convert et1310_address_map.h names from camel case
Trivial name changes.
Tested on an ET-131x device.
Signed-off-by Mark Einon <[email protected]>
--- drivers/staging/et131x/et1310_address_map.h | 122 +++++++++++++------------- drivers/staging/et131x/et1310_mac.c | 108 ++++++++++++------------ drivers/staging/et131x/et1310_tx.c | 2 +- drivers/staging/et131x/et131x_isr.c | 2 +- 4 files changed, 117 insertions(+), 117 deletions(-)
drivers/staging/et131x/et1310_address_map.h +61 -61
@@ -267,19 +267,19 @@ struct txdma_regs { /* Location: */u32 service_complete;/* 0x1028 */ u32 cache_rd_index;/* 0x102C */ u32 cache_wr_index;/* 0x1030 */ -u32 TxDmaError;/* 0x1034 */ -u32 DescAbortCount;/* 0x1038 */ -u32 PayloadAbortCnt;/* 0x103c */ -u32 WriteBackAbortCnt;/* 0x1040 */ -u32 DescTimeoutCnt;/* 0x1044 */ -u32 PayloadTimeoutCnt;/* 0x1048 */ -u32 WriteBackTimeoutCnt;/* 0x104c */ -u32 DescErrorCount;/* 0x1050 */ -u32 PayloadErrorCnt;/* 0x1054 */ -u32 WriteBackErrorCnt;/* 0x1058 */ -u32 DroppedTLPCount;/* 0x105c */ -u32 NewServiceComplete;/* 0x1060 */ -u32 EthernetPacketCount;/* 0x1064 */ +u32 tx_dma_error;/* 0x1034 */ +u32 desc_abort_cnt;/* 0x1038 */ +u32 payload_abort_cnt;/* 0x103c */ +u32 writeback_abort_cnt;/* 0x1040 */ +u32 desc_timeout_cnt;/* 0x1044 */ +u32 payload_timeout_cnt;/* 0x1048 */ +u32 writeback_timeout_cnt;/* 0x104c */ +u32 desc_error_cnt;/* 0x1050 */ +u32 payload_error_cnt;/* 0x1054 */ +u32 writeback_error_cnt;/* 0x1058 */ +u32 dropped_tlp_cnt;/* 0x105c */ +u32 new_service_complete;/* 0x1060 */ +u32 ethernet_packet_cnt;/* 0x1064 */ };/* END OF TXDMA REGISTER ADDRESS MAP */
@@ -1204,148 +1204,148 @@ struct macstat_regs { /* Location: */u32 pad[32 ];/* 0x6000 - 607C */ /* Tx/Rx 0-64 Byte Frame Counter */ -u32 TR64 ;/* 0x6080 */ +u32 txrx_0_64_byte_frames;/* 0x6080 */ /* Tx/Rx 65-127 Byte Frame Counter */ -u32 TR127 ;/* 0x6084 */ +u32 txrx_65_127_byte_frames;/* 0x6084 */ /* Tx/Rx 128-255 Byte Frame Counter */ -u32 TR255 ;/* 0x6088 */ +u32 txrx_128_255_byte_frames;/* 0x6088 */ /* Tx/Rx 256-511 Byte Frame Counter */ -u32 TR511 ;/* 0x608C */ +u32 txrx_256_511_byte_frames;/* 0x608C */ /* Tx/Rx 512-1023 Byte Frame Counter */ -u32 TR1K ;/* 0x6090 */ +u32 txrx_512_1023_byte_frames;/* 0x6090 */ /* Tx/Rx 1024-1518 Byte Frame Counter */ -u32 TRMax;/* 0x6094 */ +u32 txrx_1024_1518_byte_frames;/* 0x6094 */ /* Tx/Rx 1519-1522 Byte Good VLAN Frame Count */ -u32 TRMgv;/* 0x6098 */ +u32 txrx_1519_1522_gvln_frames;/* 0x6098 */ /* Rx Byte Counter */ -u32 RByt;/* 0x609C */ +u32 rx_bytes;/* 0x609C */ /* Rx Packet Counter */ -u32 RPkt;/* 0x60A0 */ +u32 rx_packets;/* 0x60A0 */ /* Rx FCS Error Counter */ -u32 RFcs;/* 0x60A4 */ +u32 rx_fcs_errs;/* 0x60A4 */ /* Rx Multicast Packet Counter */ -u32 RMca;/* 0x60A8 */ +u32 rx_multicast_packets;/* 0x60A8 */ /* Rx Broadcast Packet Counter */ -u32 RBca;/* 0x60AC */ +u32 rx_broadcast_packets;/* 0x60AC */ /* Rx Control Frame Packet Counter */ -u32 RxCf;/* 0x60B0 */ +u32 rx_control_frames;/* 0x60B0 */ /* Rx Pause Frame Packet Counter */ -u32 RxPf;/* 0x60B4 */ +u32 rx_pause_frames;/* 0x60B4 */ /* Rx Unknown OP Code Counter */ -u32 RxUo;/* 0x60B8 */ +u32 rx_unknown_opcodes;/* 0x60B8 */ /* Rx Alignment Error Counter */ -u32 RAln;/* 0x60BC */ +u32 rx_align_errs;/* 0x60BC */ /* Rx Frame Length Error Counter */ -u32 RFlr;/* 0x60C0 */ +u32 rx_frame_len_errs;/* 0x60C0 */ /* Rx Code Error Counter */ -u32 RCde;/* 0x60C4 */ +u32 rx_code_errs;/* 0x60C4 */ /* Rx Carrier Sense Error Counter */ -u32 RCse;/* 0x60C8 */ +u32 rx_carrier_sense_errs;/* 0x60C8 */ /* Rx Undersize Packet Counter */ -u32 RUnd;/* 0x60CC */ +u32 rx_undersize_packets;/* 0x60CC */ /* Rx Oversize Packet Counter */ -u32 ROvr;/* 0x60D0 */ +u32 rx_oversize_packets;/* 0x60D0 */ /* Rx Fragment Counter */ -u32 RFrg;/* 0x60D4 */ +u32 rx_fragment_packets;/* 0x60D4 */ /* Rx Jabber Counter */ -u32 RJbr;/* 0x60D8 */ +u32 rx_jabbers;/* 0x60D8 */ /* Rx Drop */ -u32 RDrp;/* 0x60DC */ +u32 rx_drops;/* 0x60DC */ /* Tx Byte Counter */ -u32 TByt;/* 0x60E0 */ +u32 tx_bytes;/* 0x60E0 */ /* Tx Packet Counter */ -u32 TPkt;/* 0x60E4 */ +u32 tx_packets;/* 0x60E4 */ /* Tx Multicast Packet Counter */ -u32 TMca;/* 0x60E8 */ +u32 tx_multicast_packets;/* 0x60E8 */ /* Tx Broadcast Packet Counter */ -u32 TBca;/* 0x60EC */ +u32 tx_broadcast_packets;/* 0x60EC */ /* Tx Pause Control Frame Counter */ -u32 TxPf;/* 0x60F0 */ +u32 tx_pause_frames;/* 0x60F0 */ /* Tx Deferral Packet Counter */ -u32 TDfr;/* 0x60F4 */ +u32 tx_deferred;/* 0x60F4 */ /* Tx Excessive Deferral Packet Counter */ -u32 TEdf;/* 0x60F8 */ +u32 tx_excessive_deferred;/* 0x60F8 */ /* Tx Single Collision Packet Counter */ -u32 TScl;/* 0x60FC */ +u32 tx_single_collisions;/* 0x60FC */ /* Tx Multiple Collision Packet Counter */ -u32 TMcl;/* 0x6100 */ +u32 tx_multiple_collisions;/* 0x6100 */ /* Tx Late Collision Packet Counter */ -u32 TLcl;/* 0x6104 */ +u32 tx_late_collisions;/* 0x6104 */ /* Tx Excessive Collision Packet Counter */ -u32 TXcl;/* 0x6108 */ +u32 tx_excessive_collisions;/* 0x6108 */ /* Tx Total Collision Packet Counter */ -u32 TNcl;/* 0x610C */ +u32 tx_total_collisions;/* 0x610C */ /* Tx Pause Frame Honored Counter */ -u32 TPfh;/* 0x6110 */ +u32 tx_pause_honored_frames;/* 0x6110 */ /* Tx Drop Frame Counter */ -u32 TDrp;/* 0x6114 */ +u32 tx_drops;/* 0x6114 */ /* Tx Jabber Frame Counter */ -u32 TJbr;/* 0x6118 */ +u32 tx_jabbers;/* 0x6118 */ /* Tx FCS Error Counter */ -u32 TFcs;/* 0x611C */ +u32 tx_fcs_errs;/* 0x611C */ /* Tx Control Frame Counter */ -u32 TxCf;/* 0x6120 */ +u32 tx_control_frames;/* 0x6120 */ /* Tx Oversize Frame Counter */ -u32 TOvr;/* 0x6124 */ +u32 tx_oversize_frames;/* 0x6124 */ /* Tx Undersize Frame Counter */ -u32 TUnd;/* 0x6128 */ +u32 tx_undersize_frames;/* 0x6128 */ /* Tx Fragments Frame Counter */ -u32 TFrg;/* 0x612C */ +u32 tx_fragments;/* 0x612C */ /* Carry Register One Register */ -u32 Carry1;/* 0x6130 */ +u32 carry_reg1;/* 0x6130 */ /* Carry Register Two Register */ -u32 Carry2;/* 0x6134 */ +u32 carry_reg2;/* 0x6134 */ /* Carry Register One Mask Register */ -u32 Carry1M;/* 0x6138 */ +u32 carry_reg1_mask;/* 0x6138 */ /* Carry Register Two Mask Register */ -u32 Carry2M;/* 0x613C */ +u32 carry_reg2_mask;/* 0x613C */ };/* END OF MAC STAT REGISTER ADDRESS MAP */
drivers/staging/et131x/et1310_mac.c +54 -54
157 lines not on this page · raw message
drivers/staging/et131x/et1310_tx.c +1 -1
@@ -747,7 +747,7 @@ void et131x_handle_send_interrupt(struct et131x_adapter *etdev)struct tcb *tcb;u32 index; - serviced =readl (&etdev->regs->txdma.NewServiceComplete); + serviced =readl (&etdev->regs->txdma.new_service_complete); index =INDEX10 (serviced);/* Has the ring wrapped? Process any descriptors that do not have
drivers/staging/et131x/et131x_isr.c +1 -1
@@ -268,7 +268,7 @@ void et131x_isr_handler(struct work_struct *work)u32 txdma_err;/* Following read also clears the register (COR) */ - txdma_err =readl (&iomem->txdma.TxDmaError); + txdma_err =readl (&iomem->txdma.tx_dma_error); dev_warn(&etdev->pdev->dev, "TXDMA_ERR interrupt, error = %d\n",
Signature · 1 line
1.7.4.4