diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2007-12-13 16:02:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:07:19 -0800 |
| commit | 9329f4e4d261bb026b53565e22b7fab1d2973cd0 (patch) | |
| tree | c519a40005646a49856e338206c0ace0675aeee6 /drivers/net/pcmcia/pcnet_cs.c | |
| parent | 67b3c27c8a8d8f81ffc3fe0afc0d805d66744d18 (diff) | |
| download | blackbird-op-linux-9329f4e4d261bb026b53565e22b7fab1d2973cd0.tar.gz blackbird-op-linux-9329f4e4d261bb026b53565e22b7fab1d2973cd0.zip | |
pcmcia net: use roundup_pow_of_two() macro instead of grotesque loop
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/pcmcia/pcnet_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 51bbd582f16c..9ba56aa26a1b 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/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 pcmcia_device *link, int start_pg, 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; |
