From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 9 Nov 2005 12:32:17 +0000 (+0000)
Subject: Minor clean up for bitops
X-Git-Tag: v1.0.10~1
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=41466908809dd6170b57ca782e9f457a2d0cd240;p=alsa-tools.git

Minor clean up for bitops

Minor clean up for bitops.
---

diff --git a/ld10k1/src/bitops.h b/ld10k1/src/bitops.h
index 4276e81..68c822a 100644
--- a/ld10k1/src/bitops.h
+++ b/ld10k1/src/bitops.h
@@ -25,8 +25,8 @@ static inline int set_bit(unsigned int nr, unsigned long * addr)
 	unsigned long mask;
 	int retval;
 
-	addr += nr / (sizeof(long) * 8);
-	mask = 1UL << (nr & (sizeof(long) * 8 - 1));
+	addr += nr / (sizeof(unsigned long) * 8);
+	mask = 1UL << (nr % (sizeof(unsigned long) * 8));
 	retval = (mask & *addr) != 0;
 	*addr |= mask;
 	return retval;
@@ -37,8 +37,8 @@ static inline int clear_bit(unsigned int nr, unsigned long * addr)
 	unsigned long mask;
 	int retval;
 
-	addr += nr / (sizeof(long) * 8);
-	mask = 1UL << (nr & (sizeof(long) * 8 - 1));
+	addr += nr / (sizeof(unsigned long) * 8);
+	mask = 1UL << (nr % (sizeof(unsigned long) * 8));
 	retval = (mask & *addr) != 0;
 	*addr &= ~mask;
 	return retval;
@@ -48,8 +48,8 @@ static inline int test_bit(unsigned int nr, unsigned long * addr)
 {
 	unsigned long mask;
 
-	addr += nr / (sizeof(long) * 8);
-	mask = 1UL << (nr & (sizeof(long) * 8 - 1));
+	addr += nr / (sizeof(unsigned long) * 8);
+	mask = 1UL << (nr % (sizeof(unsigned long) * 8));
 	return ((mask & *addr) != 0);
 }