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

Commit 20548664 authored by Richard Knutsson's avatar Richard Knutsson Committed by Linus Torvalds
Browse files

[PATCH] oss/sonicvibes.c defines its own hweight32 



sound/oss/sonicvibes.c:421: error: static declaration of hweight32 follows non-static declaration
include/asm-generic/bitops/hweight.h:6: error: previous declaration of hweight32 was here

Signed-off-by: default avatarRichard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 93635133

sound/oss/sonicvibes.c

+0 −18
Original line number Diff line number Diff line
@@ -407,24 +407,6 @@ static inline unsigned ld2(unsigned int x) 
	return r;

}



/*

 * hweightN: returns the hamming weight (i.e. the number

 * of bits set) of a N-bit word

 */



#ifdef hweight32

#undef hweight32

#endif



static inline unsigned int hweight32(unsigned int w)

{

        unsigned int res = (w & 0x55555555) + ((w >> 1) & 0x55555555);

        res = (res & 0x33333333) + ((res >> 2) & 0x33333333);

        res = (res & 0x0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F);

        res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF);

        return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF);

}



/* --------------------------------------------------------------------- */



/*