Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] I2O: Beautifying

Fix some typos and minor code beautifying.

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>

authored by

Markus Lidel and committed by
Linus Torvalds
2e1973a3 dcceafe2

+20 -26
+1 -1
drivers/message/i2o/bus-osm.c
··· 17 17 #include <linux/i2o.h> 18 18 19 19 #define OSM_NAME "bus-osm" 20 - #define OSM_VERSION "$Rev$" 20 + #define OSM_VERSION "1.317" 21 21 #define OSM_DESCRIPTION "I2O Bus Adapter OSM" 22 22 23 23 static struct i2o_driver i2o_bus_driver;
+1 -1
drivers/message/i2o/config-osm.c
··· 22 22 #include <asm/uaccess.h> 23 23 24 24 #define OSM_NAME "config-osm" 25 - #define OSM_VERSION "1.248" 25 + #define OSM_VERSION "1.317" 26 26 #define OSM_DESCRIPTION "I2O Configuration OSM" 27 27 28 28 /* access mode user rw */
+2 -5
drivers/message/i2o/core.h
··· 14 14 */ 15 15 16 16 /* Exec-OSM */ 17 - extern struct bus_type i2o_bus_type; 18 - 19 17 extern struct i2o_driver i2o_exec_driver; 20 18 extern int i2o_exec_lct_get(struct i2o_controller *); 21 19 ··· 21 23 extern void __exit i2o_exec_exit(void); 22 24 23 25 /* driver */ 26 + extern struct bus_type i2o_bus_type; 27 + 24 28 extern int i2o_driver_dispatch(struct i2o_controller *, u32); 25 29 26 30 extern int __init i2o_driver_init(void); ··· 44 44 45 45 extern int i2o_iop_add(struct i2o_controller *); 46 46 extern void i2o_iop_remove(struct i2o_controller *); 47 - 48 - /* config */ 49 - extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int); 50 47 51 48 /* control registers relative to c->base */ 52 49 #define I2O_IRQ_STATUS 0x30
+5 -4
drivers/message/i2o/device.c
··· 176 176 return strlen(buf) + 1; 177 177 } 178 178 179 + /* I2O device attributes */ 179 180 struct device_attribute i2o_device_attrs[] = { 180 181 __ATTR(class_id, S_IRUGO, i2o_device_show_class_id, NULL), 181 182 __ATTR(tid, S_IRUGO, i2o_device_show_tid, NULL), ··· 506 505 * else return specific fields 507 506 * ibuf contains fieldindexes 508 507 * 509 - * if oper == I2O_PARAMS_LIST_GET, get from specific rows 510 - * if fieldcount == -1 return all fields 508 + * if oper == I2O_PARAMS_LIST_GET, get from specific rows 509 + * if fieldcount == -1 return all fields 511 510 * ibuf contains rowcount, keyvalues 512 - * else return specific fields 511 + * else return specific fields 513 512 * fieldcount is # of fieldindexes 514 - * ibuf contains fieldindexes, rowcount, keyvalues 513 + * ibuf contains fieldindexes, rowcount, keyvalues 515 514 * 516 515 * You could also use directly function i2o_issue_params(). 517 516 */
+1 -1
drivers/message/i2o/driver.c
··· 64 64 struct bus_type i2o_bus_type = { 65 65 .name = "i2o", 66 66 .match = i2o_bus_match, 67 - .dev_attrs = i2o_device_attrs, 67 + .dev_attrs = i2o_device_attrs 68 68 }; 69 69 70 70 /**
+5 -3
drivers/message/i2o/i2o_block.c
··· 59 59 #include <linux/blkdev.h> 60 60 #include <linux/hdreg.h> 61 61 62 + #include <scsi/scsi.h> 63 + 62 64 #include "i2o_block.h" 63 65 64 66 #define OSM_NAME "block-osm" 65 - #define OSM_VERSION "1.287" 67 + #define OSM_VERSION "1.316" 66 68 #define OSM_DESCRIPTION "I2O Block Device OSM" 67 69 68 70 static struct i2o_driver i2o_block_driver; ··· 847 845 * RETURN_SENSE_DATA_IN_REPLY_MESSAGE_FRAME 848 846 */ 849 847 if (rq_data_dir(req) == READ) { 850 - cmd[0] = 0x28; 848 + cmd[0] = READ_10; 851 849 scsi_flags = 0x60a0000a; 852 850 } else { 853 - cmd[0] = 0x2A; 851 + cmd[0] = WRITE_10; 854 852 scsi_flags = 0xa0a0000a; 855 853 } 856 854
+1 -1
drivers/message/i2o/i2o_proc.c
··· 28 28 */ 29 29 30 30 #define OSM_NAME "proc-osm" 31 - #define OSM_VERSION "1.145" 31 + #define OSM_VERSION "1.316" 32 32 #define OSM_DESCRIPTION "I2O ProcFS OSM" 33 33 34 34 #define I2O_MAX_MODULES 4
+1 -1
drivers/message/i2o/i2o_scsi.c
··· 70 70 #include <scsi/sg_request.h> 71 71 72 72 #define OSM_NAME "scsi-osm" 73 - #define OSM_VERSION "1.282" 73 + #define OSM_VERSION "1.316" 74 74 #define OSM_DESCRIPTION "I2O SCSI Peripheral OSM" 75 75 76 76 static struct i2o_driver i2o_scsi_driver;
+3 -9
drivers/message/i2o/iop.c
··· 32 32 #include "core.h" 33 33 34 34 #define OSM_NAME "i2o" 35 - #define OSM_VERSION "1.288" 35 + #define OSM_VERSION "1.316" 36 36 #define OSM_DESCRIPTION "I2O subsystem" 37 37 38 38 /* global I2O controller list */ ··· 730 730 * Provide three SGL-elements: 731 731 * System table (SysTab), Private memory space declaration and 732 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 735 msg->body[0] = cpu_to_le32(c->unit + 2); ··· 752 756 else 753 757 osm_debug("%s: SysTab set.\n", c->name); 754 758 755 - i2o_status_get(c); // Entered READY state 756 - 757 759 return rc; 758 760 } 759 761 ··· 761 767 * 762 768 * Send the system table and enable the I2O controller. 763 769 * 764 - * Returns 0 on success or negativer error code on failure. 770 + * Returns 0 on success or negative error code on failure. 765 771 */ 766 772 static int i2o_iop_online(struct i2o_controller *c) 767 773 { ··· 971 977 * The HRT contains information about possible hidden devices but is 972 978 * mostly useless to us. 973 979 * 974 - * Returns 0 on success or negativer error code on failure. 980 + * Returns 0 on success or negative error code on failure. 975 981 */ 976 982 static int i2o_hrt_get(struct i2o_controller *c) 977 983 {