diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2007-05-23 16:58:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 23:14:14 -0400 |
commit | 82cd0e8410ae74d3fd39d168049381eafc489e5b (patch) | |
tree | 0b1a873e6a76fd478c49e9c99be751f58b793096 /drivers/message | |
parent | be324797d9b2a10f767e89dfbd880c735249bef9 (diff) |
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/i2o/driver.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/message/i2o/driver.c b/drivers/message/i2o/driver.c index a3ee1796af0c..e0d474b17433 100644 --- a/drivers/message/i2o/driver.c +++ b/drivers/message/i2o/driver.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/workqueue.h> | 20 | #include <linux/workqueue.h> |
21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | #include <linux/log2.h> | ||
24 | #include "core.h" | 23 | #include "core.h" |
25 | 24 | ||
26 | #define OSM_NAME "i2o" | 25 | #define OSM_NAME "i2o" |
@@ -340,10 +339,9 @@ int __init i2o_driver_init(void) | |||
340 | 339 | ||
341 | spin_lock_init(&i2o_drivers_lock); | 340 | spin_lock_init(&i2o_drivers_lock); |
342 | 341 | ||
343 | if ((i2o_max_drivers < 2) || (i2o_max_drivers > 64) || | 342 | if ((i2o_max_drivers < 2) || (i2o_max_drivers > 64)) { |
344 | !is_power_of_2(i2o_max_drivers)) { | 343 | osm_warn("max_drivers set to %d, but must be >=2 and <= 64\n", |
345 | osm_warn("max_drivers set to %d, but must be >=2 and <= 64 and " | 344 | i2o_max_drivers); |
346 | "a power of 2\n", i2o_max_drivers); | ||
347 | i2o_max_drivers = I2O_MAX_DRIVERS; | 345 | i2o_max_drivers = I2O_MAX_DRIVERS; |
348 | } | 346 | } |
349 | osm_info("max drivers = %d\n", i2o_max_drivers); | 347 | osm_info("max drivers = %d\n", i2o_max_drivers); |