From: Andrew Morton <akpm@osdl.org>
Date: Sun, 26 Mar 2006 09:38:56 +0000 (-0800)
Subject: [PATCH] cmpci: don't use generic_hweight32()
X-Git-Tag: v2.6.17-rc1~536
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b53f7870d1657831df23788d1984aac3b5a97bd;p=linux-2.6

[PATCH] cmpci: don't use generic_hweight32()

It's about to go away.

Cc: Akinobu Mita <mita@miraclelinux.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index 1fbd5137f6..de60a059ff 100644
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -1713,7 +1713,7 @@ static int mixer_ioctl(struct cm_state *s, unsigned int cmd, unsigned long arg)
 	case SOUND_MIXER_RECSRC: /* Arg contains a bit for each recording source */
 		if (get_user(val, p))
 			return -EFAULT;
-		i = generic_hweight32(val);
+		i = hweight32(val);
 		for (j = i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
 			if (!(val & (1 << i)))
 				continue;