From 771e3750bfe91c5283621fbe9949072e0207b250 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Fri, 13 Nov 2009 12:53:08 +0100
Subject: [PATCH] --- yaml --- r: 172674 b: refs/heads/master c:
 af0940dac37545b1e7900b19c464fb6367d3f82f h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/ieee1394/ohci1394.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index cc98c45dd422..c5ca629595eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2c0a2ac3e59f4764c59c23bd90b571e44256030
+refs/heads/master: af0940dac37545b1e7900b19c464fb6367d3f82f
diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c
index 65c1429e4129..d0dc1db80b29 100644
--- a/trunk/drivers/ieee1394/ohci1394.c
+++ b/trunk/drivers/ieee1394/ohci1394.c
@@ -82,6 +82,7 @@
  *
  */
 
+#include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/slab.h>
@@ -434,7 +435,6 @@ static void initialize_dma_trm_ctx(struct dma_trm_ctx *d)
 /* Count the number of available iso contexts */
 static int get_nb_iso_ctx(struct ti_ohci *ohci, int reg)
 {
-	int i,ctx=0;
 	u32 tmp;
 
 	reg_write(ohci, reg, 0xffffffff);
@@ -443,11 +443,7 @@ static int get_nb_iso_ctx(struct ti_ohci *ohci, int reg)
 	DBGMSG("Iso contexts reg: %08x implemented: %08x", reg, tmp);
 
 	/* Count the number of contexts */
-	for (i=0; i<32; i++) {
-	    	if (tmp & 1) ctx++;
-		tmp >>= 1;
-	}
-	return ctx;
+	return hweight32(tmp);
 }
 
 /* Global initialization */