diff options
author | Markus Lidel <Markus.Lidel@shadowconnect.com> | 2005-06-24 01:02:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:05:29 -0400 |
commit | 9e87545f06930c1d294423a8091d1077e7444a47 (patch) | |
tree | ef05fca1becfa0e1584f234ddf9b1a430b7d018e /include/linux/i2o-dev.h | |
parent | b2aaee33fbb354a2f08121aa1c1be55841102761 (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 'include/linux/i2o-dev.h')
-rw-r--r-- | include/linux/i2o-dev.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/include/linux/i2o-dev.h b/include/linux/i2o-dev.h index d4a08d29e36d..36fd18cdad28 100644 --- a/include/linux/i2o-dev.h +++ b/include/linux/i2o-dev.h | |||
@@ -33,18 +33,6 @@ typedef unsigned int u32; | |||
33 | #endif /* __KERNEL__ */ | 33 | #endif /* __KERNEL__ */ |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * Software module types | ||
37 | */ | ||
38 | #define I2O_SOFTWARE_MODULE_IRTOS 0x11 | ||
39 | #define I2O_SOFTWARE_MODULE_IOP_PRIVATE 0x22 | ||
40 | #define I2O_SOFTWARE_MODULE_IOP_CONFIG 0x23 | ||
41 | |||
42 | /* | ||
43 | * Vendors | ||
44 | */ | ||
45 | #define I2O_VENDOR_DPT 0x001b | ||
46 | |||
47 | /* | ||
48 | * I2O Control IOCTLs and structures | 36 | * I2O Control IOCTLs and structures |
49 | */ | 37 | */ |
50 | #define I2O_MAGIC_NUMBER 'i' | 38 | #define I2O_MAGIC_NUMBER 'i' |
@@ -414,6 +402,17 @@ typedef struct _i2o_status_block { | |||
414 | #define ADAPTER_STATE_FAILED 0x10 | 402 | #define ADAPTER_STATE_FAILED 0x10 |
415 | #define ADAPTER_STATE_FAULTED 0x11 | 403 | #define ADAPTER_STATE_FAULTED 0x11 |
416 | 404 | ||
405 | /* | ||
406 | * Software module types | ||
407 | */ | ||
408 | #define I2O_SOFTWARE_MODULE_IRTOS 0x11 | ||
409 | #define I2O_SOFTWARE_MODULE_IOP_PRIVATE 0x22 | ||
410 | #define I2O_SOFTWARE_MODULE_IOP_CONFIG 0x23 | ||
411 | |||
412 | /* | ||
413 | * Vendors | ||
414 | */ | ||
415 | #define I2O_VENDOR_DPT 0x001b | ||
417 | 416 | ||
418 | /* | 417 | /* |
419 | * DPT / Adaptec specific values for i2o_sg_io_hdr flags. | 418 | * DPT / Adaptec specific values for i2o_sg_io_hdr flags. |