Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12d4f964 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

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: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 02cc343b

drivers/staging/et131x/et1310_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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  */