Skip to contentSkip to conversation

pcmcia net: use roundup_pow_of_two() macro instead of grotesque loop

PATCH Applied [email protected] 2 participants 2 messages Dec 14, 2007 – Dec 18, 2007

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 5/10 pcmcia net: use roundup_pow_of_two() macro instead of grotesque loop

From: "Robert P. J. Day" <[email protected]>

Signed-off-by Robert P. J. Day <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Dominik Brodowski <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/net/pcmcia/pcnet_cs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/pcmcia/pcnet_cs.c renamed from drivers/net/pcmcia/pcnet_cs.c~pcmcia-net-use-roundup_pow_of_two-macro-instead-of-grotesque-loop +2 -2
diff -puN drivers/net/pcmcia/pcnet_cs.c~pcmcia-net-use-roundup_pow_of_two-macro-instead-of-grotesque-loop drivers/net/pcmcia/pcnet_cs.c
@@ -38,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
+#include <linux/log2.h>
 #include "../8390.h"
 
 #include <pcmcia/cs_types.h>

@@ -1484,8 +1485,7 @@ static int setup_shmem_window(struct pcm
 	window_size = 32 * 1024;
 
     /* Make sure it's a power of two.  */
-    while ((window_size & (window_size - 1)) != 0)
-	window_size += window_size & ~(window_size - 1);
+    window_size = roundup_pow_of_two(window_size);
 
     /* Allocate a memory window */
     req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM|WIN_ENABLE;

_