AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] I2O: Beautifying

Browse Source 
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>
This commit is contained in:
Markus Lidel 2006-01-06 00:19:32 -08:00 committed by Linus Torvalds
parent dcceafe25a
commit 2e1973a3cd
9 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/message/i2o/bus-osm.c
View File

@ -17,7 +17,7 @@
#include <linux/i2o.h>
#define OSM_NAME "bus-osm"
#define OSM_VERSION "$Rev$"
#define OSM_VERSION "1.317"
#define OSM_DESCRIPTION "I2O Bus Adapter OSM"
static struct i2o_driver i2o_bus_driver;

2
drivers/message/i2o/config-osm.c
View File

@ -22,7 +22,7 @@
#include <asm/uaccess.h>
#define OSM_NAME "config-osm"
#define OSM_VERSION "1.248"
#define OSM_VERSION "1.317"
#define OSM_DESCRIPTION "I2O Configuration OSM"
/* access mode user rw */

7
drivers/message/i2o/core.h
View File

@ -14,8 +14,6 @@
*/
/* Exec-OSM */
extern struct bus_type i2o_bus_type;
extern struct i2o_driver i2o_exec_driver;
extern int i2o_exec_lct_get(struct i2o_controller *);
@ -23,6 +21,8 @@ extern int __init i2o_exec_init(void);
extern void __exit i2o_exec_exit(void);
/* driver */
extern struct bus_type i2o_bus_type;
extern int i2o_driver_dispatch(struct i2o_controller *, u32);
extern int __init i2o_driver_init(void);
@ -45,9 +45,6 @@ extern void i2o_iop_free(struct i2o_controller *);
extern int i2o_iop_add(struct i2o_controller *);
extern void i2o_iop_remove(struct i2o_controller *);
/* config */
extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int);
/* control registers relative to c->base */
#define I2O_IRQ_STATUS 0x30
#define I2O_IRQ_MASK 0x34

9
drivers/message/i2o/device.c
View File

@ -176,6 +176,7 @@ static ssize_t i2o_device_show_tid(struct device *dev,
return strlen(buf) + 1;
}
/* I2O device attributes */
struct device_attribute i2o_device_attrs[] = {
__ATTR(class_id, S_IRUGO, i2o_device_show_class_id, NULL),
__ATTR(tid, S_IRUGO, i2o_device_show_tid, NULL),
@ -505,12 +506,12 @@ int i2o_parm_field_get(struct i2o_device *i2o_dev, int group, int field,
* else return specific fields
* ibuf contains fieldindexes
*
* if oper == I2O_PARAMS_LIST_GET, get from specific rows
* if fieldcount == -1 return all fields
* if oper == I2O_PARAMS_LIST_GET, get from specific rows
* if fieldcount == -1 return all fields
* ibuf contains rowcount, keyvalues
* else return specific fields
* else return specific fields
* fieldcount is # of fieldindexes
* ibuf contains fieldindexes, rowcount, keyvalues
* ibuf contains fieldindexes, rowcount, keyvalues
*
* You could also use directly function i2o_issue_params().
*/

2
drivers/message/i2o/driver.c
View File

@ -64,7 +64,7 @@ static int i2o_bus_match(struct device *dev, struct device_driver *drv)
struct bus_type i2o_bus_type = {
.name = "i2o",
.match = i2o_bus_match,
.dev_attrs = i2o_device_attrs,
.dev_attrs = i2o_device_attrs
};
/**

8
drivers/message/i2o/i2o_block.c
View File

@ -59,10 +59,12 @@
#include <linux/blkdev.h>
#include <linux/hdreg.h>
#include <scsi/scsi.h>
#include "i2o_block.h"
#define OSM_NAME "block-osm"
#define OSM_VERSION "1.287"
#define OSM_VERSION "1.316"
#define OSM_DESCRIPTION "I2O Block Device OSM"
static struct i2o_driver i2o_block_driver;
@ -845,10 +847,10 @@ static int i2o_block_transfer(struct request *req)
* RETURN_SENSE_DATA_IN_REPLY_MESSAGE_FRAME
*/
if (rq_data_dir(req) == READ) {
cmd[0] = 0x28;
cmd[0] = READ_10;
scsi_flags = 0x60a0000a;
} else {
cmd[0] = 0x2A;
cmd[0] = WRITE_10;
scsi_flags = 0xa0a0000a;
}

2
drivers/message/i2o/i2o_proc.c
View File

@ -28,7 +28,7 @@
*/
#define OSM_NAME "proc-osm"
#define OSM_VERSION "1.145"
#define OSM_VERSION "1.316"
#define OSM_DESCRIPTION "I2O ProcFS OSM"
#define I2O_MAX_MODULES 4

2
drivers/message/i2o/i2o_scsi.c
View File

@ -70,7 +70,7 @@
#include <scsi/sg_request.h>
#define OSM_NAME "scsi-osm"
#define OSM_VERSION "1.282"
#define OSM_VERSION "1.316"
#define OSM_DESCRIPTION "I2O SCSI Peripheral OSM"
static struct i2o_driver i2o_scsi_driver;

12
drivers/message/i2o/iop.c
View File

@ -32,7 +32,7 @@
#include "core.h"
#define OSM_NAME "i2o"
#define OSM_VERSION "1.288"
#define OSM_VERSION "1.316"
#define OSM_DESCRIPTION "I2O subsystem"
/* global I2O controller list */
@ -730,10 +730,6 @@ static int i2o_iop_systab_set(struct i2o_controller *c)
* Provide three SGL-elements:
* System table (SysTab), Private memory space declaration and
* Private i/o space declaration
*
* FIXME: is this still true?
* Nasty one here. We can't use dma_alloc_coherent to send the
* same table to everyone. We have to go remap it for them all
*/
msg->body[0] = cpu_to_le32(c->unit + 2);
@ -756,8 +752,6 @@ static int i2o_iop_systab_set(struct i2o_controller *c)
else
osm_debug("%s: SysTab set.\n", c->name);
i2o_status_get(c); // Entered READY state
return rc;
}
@ -767,7 +761,7 @@ static int i2o_iop_systab_set(struct i2o_controller *c)
*
* Send the system table and enable the I2O controller.
*
* Returns 0 on success or negativer error code on failure.
* Returns 0 on success or negative error code on failure.
*/
static int i2o_iop_online(struct i2o_controller *c)
{
@ -977,7 +971,7 @@ int i2o_status_get(struct i2o_controller *c)
* The HRT contains information about possible hidden devices but is
* mostly useless to us.
*
* Returns 0 on success or negativer error code on failure.
* Returns 0 on success or negative error code on failure.
*/
static int i2o_hrt_get(struct i2o_controller *c)
{