beceem: eliminate unused bcm_jiffies (5cf084f4) · Commits · e / devices / android_kernel_teracube_emerald

drivers/staging/bcm/Adapter.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -404,7 +404,6 @@ struct _MINI_ADAPTER
		PPER_TARANG_DATA pTarangs;
		spinlock_t control_queue_lock;
		wait_queue_head_t process_read_wait_queue;
		ULONG bcm_jiffies; /* Store Jiffies value */

		// the pointer to the first packet we have queued in send
		// deserialized miniport support variables

+3 −21

Original line number	Diff line number	Diff line
		@@ -172,10 +172,8 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "UpdateTokenCount ");
		if(Adapter->IdleMode \|\| Adapter->bPreparingForLowPowerMode)
		{
		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Device is in Idle Mode..Hence blocking Data Packets..\n");
		return;
		}
		return; /* in idle mode */

		// Check for Free Descriptors
		if(atomic_read(&Adapter->CurrNumFreeTxDesc) <= MINIMUM_PENDING_DESCRIPTORS)
		{
		@@ -262,17 +260,6 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
		}
		}
		}

		if(Status != STATUS_SUCCESS) //Tx of data packet to device Failed
		{
		if(Adapter->bcm_jiffies == 0)
		Adapter->bcm_jiffies = jiffies;
		}
		else
		{
		Adapter->bcm_jiffies = 0;
		}
		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "<=====");
		}


		@@ -359,12 +346,7 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
		if(exit_flag == TRUE )
		break ;
		}/* end of inner while loop */
		if(Adapter->bcm_jiffies == 0 &&
		atomic_read(&Adapter->TotalPacketCount) != 0 &&
		uiPrevTotalCount == atomic_read(&Adapter->TotalPacketCount))
		{
		Adapter->bcm_jiffies = jiffies;
		}

		update_per_cid_rx (Adapter);
		Adapter->txtransmit_running = 0;
		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "<======");

+0 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,6 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
		Adapter->PackInfo[iIndex].uiDroppedCountPackets);

		atomic_dec(&Adapter->TotalPacketCount);
		Adapter->bcm_jiffies = jiffies;
		}

		spin_unlock_bh(&Adapter->PackInfo[iIndex].SFQueueLock);

+0 −6

Original line number	Diff line number	Diff line
		@@ -55,12 +55,6 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
		((PLeader->PLength-1)/MAX_DEVICE_DESC_SIZE)+1))
		{
		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "NO FREE DESCRIPTORS TO SEND CONTROL PACKET");
		if(Adapter->bcm_jiffies == 0)
		{
		Adapter->bcm_jiffies = jiffies;
		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "UPDATED TIME(hex): %lu",
		Adapter->bcm_jiffies);
		}
		return STATUS_FAILURE;
		}