Skip to content

Commit

Permalink
pcmcia net: use roundup_pow_of_two() macro instead of grotesque loop
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Robert P. J. Day authored and David S. Miller committed Jan 28, 2008
1 parent 67b3c27 commit 9329f4e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/pcmcia/pcnet_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 9329f4e

Please sign in to comment.