Re: [PATCH] i2o: fix notifiers when max_drivers is configured

[Akinobu Mita <akinobu.mita@gmail.com>]

On Sun, May 20, 2007 at 09:16:59PM -0700, Andrew Morton wrote:
> > @@ -340,8 +341,7 @@ int __init i2o_driver_init(void)
> >  	spin_lock_init(&i2o_drivers_lock);
> >  
> >  	if ((i2o_max_drivers < 2) || (i2o_max_drivers > 64) ||
> > -	    ((i2o_max_drivers ^ (i2o_max_drivers - 1)) !=
> > -	     (2 * i2o_max_drivers - 1))) {
> > +	    !is_power_of_2(i2o_max_drivers)) {
> >  		osm_warn("max_drivers set to %d, but must be >=2 and <= 64 and "
> >  			 "a power of 2\n", i2o_max_drivers);
> >  		i2o_max_drivers = I2O_MAX_DRIVERS;
> 
> Is there any particular reason why i2o_max_drivers must be a power of two? 
> It seems a peculiar constraint.

I can't find the reason.

Subject: [patch -mm] i2o: eliminate a peculiar constraint on i2o_max_drivers

There is no reason i2o_max_drivers must be a power of two.
This patch eliminates such a constraint.

Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>

---
 drivers/message/i2o/driver.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Index: 2.6-mm/drivers/message/i2o/driver.c
===================================================================
--- 2.6-mm.orig/drivers/message/i2o/driver.c
+++ 2.6-mm/drivers/message/i2o/driver.c
@@ -20,7 +20,6 @@
 #include <linux/workqueue.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/log2.h>
 #include "core.h"
 
 #define OSM_NAME	"i2o"
@@ -340,10 +339,9 @@ int __init i2o_driver_init(void)
 
 	spin_lock_init(&i2o_drivers_lock);
 
-	if ((i2o_max_drivers < 2) || (i2o_max_drivers > 64) ||
-	    !is_power_of_2(i2o_max_drivers)) {
-		osm_warn("max_drivers set to %d, but must be >=2 and <= 64 and "
-			 "a power of 2\n", i2o_max_drivers);
+	if ((i2o_max_drivers < 2) || (i2o_max_drivers > 64)) {
+		osm_warn("max_drivers set to %d, but must be >=2 and <= 64\n",
+			 i2o_max_drivers);
 		i2o_max_drivers = I2O_MAX_DRIVERS;
 	}
 	osm_info("max drivers = %d\n", i2o_max_drivers);