diff options
Diffstat (limited to 'drivers/message/i2o/iop.c')
-rw-r--r-- | drivers/message/i2o/iop.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index 7411a0504bf2..0e465186196c 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "core.h" | 32 | #include "core.h" |
33 | 33 | ||
34 | #define OSM_NAME "i2o" | 34 | #define OSM_NAME "i2o" |
35 | #define OSM_VERSION "1.288" | 35 | #define OSM_VERSION "1.316" |
36 | #define OSM_DESCRIPTION "I2O subsystem" | 36 | #define OSM_DESCRIPTION "I2O subsystem" |
37 | 37 | ||
38 | /* global I2O controller list */ | 38 | /* global I2O controller list */ |
@@ -730,10 +730,6 @@ static int i2o_iop_systab_set(struct i2o_controller *c) | |||
730 | * Provide three SGL-elements: | 730 | * Provide three SGL-elements: |
731 | * System table (SysTab), Private memory space declaration and | 731 | * System table (SysTab), Private memory space declaration and |
732 | * Private i/o space declaration | 732 | * Private i/o space declaration |
733 | * | ||
734 | * FIXME: is this still true? | ||
735 | * Nasty one here. We can't use dma_alloc_coherent to send the | ||
736 | * same table to everyone. We have to go remap it for them all | ||
737 | */ | 733 | */ |
738 | 734 | ||
739 | msg->body[0] = cpu_to_le32(c->unit + 2); | 735 | msg->body[0] = cpu_to_le32(c->unit + 2); |
@@ -756,8 +752,6 @@ static int i2o_iop_systab_set(struct i2o_controller *c) | |||
756 | else | 752 | else |
757 | osm_debug("%s: SysTab set.\n", c->name); | 753 | osm_debug("%s: SysTab set.\n", c->name); |
758 | 754 | ||
759 | i2o_status_get(c); // Entered READY state | ||
760 | |||
761 | return rc; | 755 | return rc; |
762 | } | 756 | } |
763 | 757 | ||
@@ -767,7 +761,7 @@ static int i2o_iop_systab_set(struct i2o_controller *c) | |||
767 | * | 761 | * |
768 | * Send the system table and enable the I2O controller. | 762 | * Send the system table and enable the I2O controller. |
769 | * | 763 | * |
770 | * Returns 0 on success or negativer error code on failure. | 764 | * Returns 0 on success or negative error code on failure. |
771 | */ | 765 | */ |
772 | static int i2o_iop_online(struct i2o_controller *c) | 766 | static int i2o_iop_online(struct i2o_controller *c) |
773 | { | 767 | { |
@@ -977,7 +971,7 @@ int i2o_status_get(struct i2o_controller *c) | |||
977 | * The HRT contains information about possible hidden devices but is | 971 | * The HRT contains information about possible hidden devices but is |
978 | * mostly useless to us. | 972 | * mostly useless to us. |
979 | * | 973 | * |
980 | * Returns 0 on success or negativer error code on failure. | 974 | * Returns 0 on success or negative error code on failure. |
981 | */ | 975 | */ |
982 | static int i2o_hrt_get(struct i2o_controller *c) | 976 | static int i2o_hrt_get(struct i2o_controller *c) |
983 | { | 977 | { |