From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch 05/10] pcmcia net: use roundup_pow_of_two() macro instead of grotesque loop Date: Thu, 13 Dec 2007 16:02:55 -0800 Message-ID: <200712140002.lBE02u8R025523@imap1.linux-foundation.org> Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, rpjday@crashcourse.ca, linux@dominikbrodowski.net To: jeff@garzik.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:47533 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933921AbXLNAJb (ORCPT ); Thu, 13 Dec 2007 19:09:31 -0500 Sender: netdev-owner@vger.kernel.org List-ID: From: "Robert P. J. Day" Signed-off-by: Robert P. J. Day Cc: Jeff Garzik Cc: Dominik Brodowski Signed-off-by: Andrew Morton --- 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 #include #include +#include #include "../8390.h" #include @@ -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; _