aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/i2o/i2o_config.c
diff options
context:
space:
mode:
authorMarkus Lidel <Markus.Lidel@shadowconnect.com>2005-06-24 01:02:21 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:05:29 -0400
commit9e87545f06930c1d294423a8091d1077e7444a47 (patch)
treeef05fca1becfa0e1584f234ddf9b1a430b7d018e /drivers/message/i2o/i2o_config.c
parentb2aaee33fbb354a2f08121aa1c1be55841102761 (diff)
[PATCH] I2O: second code cleanup of sparse warnings and unneeded syncronization
Changes: - Added header "core.h" for i2o_core.ko internal definitions - More sparse fixes - Changed display of TID's in sysfs attributes from XXX to 0xXXX - Use the right functions for accessing I/O and normal memory - Removed error handling of SCSI device errors and let the SCSI layer take care of it - Added new device / removed device handling to SCSI-OSM - Make status access volatile - Cleaned up activation of I2O controller - Removed unnecessary wmb() and rmb() calls - Use own struct i2o_io for I/O memory instead of struct i2o_dma Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/message/i2o/i2o_config.c')
-rw-r--r--drivers/message/i2o/i2o_config.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 7636833b4623..8160a1f6c73a 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -36,6 +36,8 @@
36 36
37#include <asm/uaccess.h> 37#include <asm/uaccess.h>
38 38
39#define SG_TABLESIZE 30
40
39extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int); 41extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int);
40 42
41static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int cmd, 43static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int cmd,
@@ -663,7 +665,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd, unsigned long ar
663 goto sg_list_cleanup; 665 goto sg_list_cleanup;
664 666
665 if (sg_offset) { 667 if (sg_offset) {
666 u32 msg[MSG_FRAME_SIZE]; 668 u32 msg[I2O_OUTBOUND_MSG_FRAME_SIZE];
667 /* Copy back the Scatter Gather buffers back to user space */ 669 /* Copy back the Scatter Gather buffers back to user space */
668 u32 j; 670 u32 j;
669 // TODO 64bit fix 671 // TODO 64bit fix
@@ -671,7 +673,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd, unsigned long ar
671 int sg_size; 673 int sg_size;
672 674
673 // re-acquire the original message to handle correctly the sg copy operation 675 // re-acquire the original message to handle correctly the sg copy operation
674 memset(&msg, 0, MSG_FRAME_SIZE * 4); 676 memset(&msg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
675 // get user msg size in u32s 677 // get user msg size in u32s
676 if (get_user(size, &user_msg[0])) { 678 if (get_user(size, &user_msg[0])) {
677 rcode = -EFAULT; 679 rcode = -EFAULT;
@@ -902,7 +904,7 @@ static int i2o_cfg_passthru(unsigned long arg)
902 int sg_size; 904 int sg_size;
903 905
904 // re-acquire the original message to handle correctly the sg copy operation 906 // re-acquire the original message to handle correctly the sg copy operation
905 memset(&msg, 0, MSG_FRAME_SIZE * 4); 907 memset(&msg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
906 // get user msg size in u32s 908 // get user msg size in u32s
907 if (get_user(size, &user_msg[0])) { 909 if (get_user(size, &user_msg[0])) {
908 rcode = -EFAULT; 910 rcode = -EFAULT;