[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200711212302.lALN2u8h013664@imap1.linux-foundation.org>
Date: Wed, 21 Nov 2007 15:02:56 -0800
From: akpm@...ux-foundation.org
To: jeff@...zik.org
Cc: netdev@...r.kernel.org, akpm@...ux-foundation.org,
rpjday@...shcourse.ca, linux@...inikbrodowski.net
Subject: [patch 5/8] pcmcia net: use roundup_pow_of_two() macro instead of grotesque loop
From: "Robert P. J. Day" <rpjday@...shcourse.ca>
Signed-off-by: Robert P. J. Day <rpjday@...shcourse.ca>
Cc: Jeff Garzik <jeff@...zik.org>
Cc: Dominik Brodowski <linux@...inikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
drivers/net/pcmcia/pcnet_cs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
--- a/drivers/net/pcmcia/pcnet_cs.c~pcmcia-net-use-roundup_pow_of_two-macro-instead-of-grotesque-loop
+++ a/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;
_
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists