---

yaml --- r: 66773 b: refs/heads/master c: 2e08ac7 h: refs/heads/master i: 66771: 0b618bb v: v3
git-mirror · Oct 10, 2007 · b24bb51 · b24bb51
1 parent 33bae9f
commit b24bb51
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 46 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a1532f2f87175285b9459dcce58e467feec6b78
+refs/heads/master: 2e08ac7e27c1e54ebf0f82abc03285663efe7d89
diff --git a/trunk/drivers/net/wireless/adm8211.c b/trunk/drivers/net/wireless/adm8211.c
@@ -458,51 +458,45 @@ do {									   \
 
 	struct ieee80211_hw *dev = dev_id;
 	struct adm8211_priv *priv = dev->priv;
-	unsigned int count = 0;
-	u32 stsr;
-
-	do {
-		stsr = ADM8211_CSR_READ(STSR);
-		ADM8211_CSR_WRITE(STSR, stsr);
-		if (stsr == 0xffffffff)
-			return IRQ_HANDLED;
-
-		if (!(stsr & (ADM8211_STSR_NISS | ADM8211_STSR_AISS)))
-			break;
-
-		if (stsr & ADM8211_STSR_RCI)
-			adm8211_interrupt_rci(dev);
-		if (stsr & ADM8211_STSR_TCI)
-			adm8211_interrupt_tci(dev);
-
-		/*ADM8211_INT(LinkOn);*/
-		/*ADM8211_INT(LinkOff);*/
-
-		ADM8211_INT(PCF);
-		ADM8211_INT(BCNTC);
-		ADM8211_INT(GPINT);
-		ADM8211_INT(ATIMTC);
-		ADM8211_INT(TSFTF);
-		ADM8211_INT(TSCZ);
-		ADM8211_INT(SQL);
-		ADM8211_INT(WEPTD);
-		ADM8211_INT(ATIME);
-		/*ADM8211_INT(TBTT);*/
-		ADM8211_INT(TEIS);
-		ADM8211_INT(FBE);
-		ADM8211_INT(REIS);
-		ADM8211_INT(GPTT);
-		ADM8211_INT(RPS);
-		ADM8211_INT(RDU);
-		ADM8211_INT(TUF);
-		/*ADM8211_INT(TRT);*/
-		/*ADM8211_INT(TLT);*/
-		/*ADM8211_INT(TDU);*/
-		ADM8211_INT(TPS);
-
-	} while (count++ < 20);
-
-	return IRQ_RETVAL(count);
+	u32 stsr = ADM8211_CSR_READ(STSR);
+	ADM8211_CSR_WRITE(STSR, stsr);
+	if (stsr == 0xffffffff)
+		return IRQ_HANDLED;
+
+	if (!(stsr & (ADM8211_STSR_NISS | ADM8211_STSR_AISS)))
+		return IRQ_HANDLED;
+
+	if (stsr & ADM8211_STSR_RCI)
+		adm8211_interrupt_rci(dev);
+	if (stsr & ADM8211_STSR_TCI)
+		adm8211_interrupt_tci(dev);
+
+	/*ADM8211_INT(LinkOn);*/
+	/*ADM8211_INT(LinkOff);*/
+
+	ADM8211_INT(PCF);
+	ADM8211_INT(BCNTC);
+	ADM8211_INT(GPINT);
+	ADM8211_INT(ATIMTC);
+	ADM8211_INT(TSFTF);
+	ADM8211_INT(TSCZ);
+	ADM8211_INT(SQL);
+	ADM8211_INT(WEPTD);
+	ADM8211_INT(ATIME);
+	/*ADM8211_INT(TBTT);*/
+	ADM8211_INT(TEIS);
+	ADM8211_INT(FBE);
+	ADM8211_INT(REIS);
+	ADM8211_INT(GPTT);
+	ADM8211_INT(RPS);
+	ADM8211_INT(RDU);
+	ADM8211_INT(TUF);
+	/*ADM8211_INT(TRT);*/
+	/*ADM8211_INT(TLT);*/
+	/*ADM8211_INT(TDU);*/
+	ADM8211_INT(TPS);
+
+	return IRQ_HANDLED;
 
 #undef ADM8211_INT
 }