From 69540954d520369feef9275450105249142fdd37 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Mon, 13 Sep 2010 21:10:13 +0000 Subject: [PATCH] Cleanup git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2116 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_cdrom.c | 40 ------------------ scst/src/dev_handlers/scst_changer.c | 40 ------------------ scst/src/dev_handlers/scst_disk.c | 2 +- scst/src/dev_handlers/scst_modisk.c | 56 ++------------------------ scst/src/dev_handlers/scst_processor.c | 40 ------------------ scst/src/dev_handlers/scst_raid.c | 40 ------------------ scst/src/dev_handlers/scst_tape.c | 56 ++------------------------ 7 files changed, 7 insertions(+), 267 deletions(-) diff --git a/scst/src/dev_handlers/scst_cdrom.c b/scst/src/dev_handlers/scst_cdrom.c index 972b64896..2dd82b323 100644 --- a/scst/src/dev_handlers/scst_cdrom.c +++ b/scst/src/dev_handlers/scst_cdrom.c @@ -60,15 +60,6 @@ static struct scst_dev_type cdrom_devtype = { #endif }; -/************************************************************** - * Function: cdrom_attach - * - * Argument: - * - * Returns : 1 if attached, error code otherwise - * - * Description: - *************************************************************/ static int cdrom_attach(struct scst_device *dev) { int res, rc; @@ -180,15 +171,6 @@ out: return res; } -/************************************************************ - * Function: cdrom_detach - * - * Argument: - * - * Returns : None - * - * Description: Called to detach this device type driver - ************************************************************/ static void cdrom_detach(struct scst_device *dev) { struct cdrom_params *params = @@ -213,17 +195,6 @@ static int cdrom_get_block_shift(struct scst_cmd *cmd) return params->block_shift; } -/******************************************************************** - * Function: cdrom_parse - * - * Argument: - * - * Returns : The state of the command - * - * Description: This does the parsing of the command - * - * Note: Not all states are allowed on return - ********************************************************************/ static int cdrom_parse(struct scst_cmd *cmd) { int res = SCST_CMD_STATE_DEFAULT; @@ -249,17 +220,6 @@ static void cdrom_set_block_shift(struct scst_cmd *cmd, int block_shift) return; } -/******************************************************************** - * Function: cdrom_done - * - * Argument: - * - * Returns : - * - * Description: This is the completion routine for the command, - * it is used to extract any necessary information - * about a command. - ********************************************************************/ static int cdrom_done(struct scst_cmd *cmd) { int res = SCST_CMD_STATE_DEFAULT; diff --git a/scst/src/dev_handlers/scst_changer.c b/scst/src/dev_handlers/scst_changer.c index 0f1a57de3..208e6f338 100644 --- a/scst/src/dev_handlers/scst_changer.c +++ b/scst/src/dev_handlers/scst_changer.c @@ -55,15 +55,6 @@ static struct scst_dev_type changer_devtype = { #endif }; -/************************************************************** - * Function: changer_attach - * - * Argument: - * - * Returns : 1 if attached, error code otherwise - * - * Description: - *************************************************************/ static int changer_attach(struct scst_device *dev) { int res, rc; @@ -118,15 +109,6 @@ out: return res; } -/************************************************************ - * Function: changer_detach - * - * Argument: - * - * Returns : None - * - * Description: Called to detach this device type driver - ************************************************************/ #if 0 void changer_detach(struct scst_device *dev) { @@ -137,17 +119,6 @@ void changer_detach(struct scst_device *dev) } #endif -/******************************************************************** - * Function: changer_parse - * - * Argument: - * - * Returns : The state of the command - * - * Description: This does the parsing of the command - * - * Note: Not all states are allowed on return - ********************************************************************/ static int changer_parse(struct scst_cmd *cmd) { int res = SCST_CMD_STATE_DEFAULT; @@ -159,17 +130,6 @@ static int changer_parse(struct scst_cmd *cmd) return res; } -/******************************************************************** - * Function: changer_done - * - * Argument: - * - * Returns : - * - * Description: This is the completion routine for the command, - * it is used to extract any necessary information - * about a command. - ********************************************************************/ #if 0 int changer_done(struct scst_cmd *cmd) { diff --git a/scst/src/dev_handlers/scst_disk.c b/scst/src/dev_handlers/scst_disk.c index 09f45ff3c..5dcd7ac8e 100644 --- a/scst/src/dev_handlers/scst_disk.c +++ b/scst/src/dev_handlers/scst_disk.c @@ -632,7 +632,7 @@ out_error: static int disk_perf_exec(struct scst_cmd *cmd) { - int res; + int res, rc; int opcode = cmd->cdb[0]; TRACE_ENTRY(); diff --git a/scst/src/dev_handlers/scst_modisk.c b/scst/src/dev_handlers/scst_modisk.c index 90abf14e1..72418762f 100644 --- a/scst/src/dev_handlers/scst_modisk.c +++ b/scst/src/dev_handlers/scst_modisk.c @@ -48,7 +48,7 @@ static int modisk_attach(struct scst_device *); static void modisk_detach(struct scst_device *); static int modisk_parse(struct scst_cmd *); static int modisk_done(struct scst_cmd *); -static int modisk_exec(struct scst_cmd *); +static int modisk_perf_exec(struct scst_cmd *); static struct scst_dev_type modisk_devtype = { .name = MODISK_NAME, @@ -75,7 +75,7 @@ static struct scst_dev_type modisk_devtype_perf = { .detach = modisk_detach, .parse = modisk_parse, .dev_done = modisk_done, - .exec = modisk_exec, + .exec = modisk_perf_exec, #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) .default_trace_flags = SCST_DEFAULT_DEV_LOG_FLAGS, .trace_flags = &trace_flag, @@ -145,15 +145,6 @@ static void __exit exit_scst_modisk_driver(void) module_init(init_scst_modisk_driver); module_exit(exit_scst_modisk_driver); -/************************************************************** - * Function: modisk_attach - * - * Argument: - * - * Returns : 1 if attached, error code otherwise - * - * Description: - *************************************************************/ static int modisk_attach(struct scst_device *dev) { int res, rc; @@ -277,15 +268,6 @@ out: return res; } -/************************************************************ - * Function: modisk_detach - * - * Argument: - * - * Returns : None - * - * Description: Called to detach this device type driver - ************************************************************/ static void modisk_detach(struct scst_device *dev) { struct modisk_params *params = @@ -311,17 +293,6 @@ static int modisk_get_block_shift(struct scst_cmd *cmd) return params->block_shift; } -/******************************************************************** - * Function: modisk_parse - * - * Argument: - * - * Returns : The state of the command - * - * Description: This does the parsing of the command - * - * Note: Not all states are allowed on return - ********************************************************************/ static int modisk_parse(struct scst_cmd *cmd) { int res = SCST_CMD_STATE_DEFAULT; @@ -348,17 +319,6 @@ static void modisk_set_block_shift(struct scst_cmd *cmd, int block_shift) return; } -/******************************************************************** - * Function: modisk_done - * - * Argument: - * - * Returns : - * - * Description: This is the completion routine for the command, - * it is used to extract any necessary information - * about a command. - ********************************************************************/ static int modisk_done(struct scst_cmd *cmd) { int res; @@ -371,17 +331,7 @@ static int modisk_done(struct scst_cmd *cmd) return res; } -/******************************************************************** - * Function: modisk_exec - * - * Argument: - * - * Returns : - * - * Description: Make SCST do nothing for data READs and WRITES. - * Intended for raw line performance testing - ********************************************************************/ -static int modisk_exec(struct scst_cmd *cmd) +static int modisk_perf_exec(struct scst_cmd *cmd) { int res = SCST_EXEC_NOT_COMPLETED, rc; int opcode = cmd->cdb[0]; diff --git a/scst/src/dev_handlers/scst_processor.c b/scst/src/dev_handlers/scst_processor.c index c2910af60..9dffb876f 100644 --- a/scst/src/dev_handlers/scst_processor.c +++ b/scst/src/dev_handlers/scst_processor.c @@ -55,15 +55,6 @@ static struct scst_dev_type processor_devtype = { #endif }; -/************************************************************** - * Function: processor_attach - * - * Argument: - * - * Returns : 1 if attached, error code otherwise - * - * Description: - *************************************************************/ static int processor_attach(struct scst_device *dev) { int res, rc; @@ -118,15 +109,6 @@ out: return res; } -/************************************************************ - * Function: processor_detach - * - * Argument: - * - * Returns : None - * - * Description: Called to detach this device type driver - ************************************************************/ #if 0 void processor_detach(struct scst_device *dev) { @@ -137,17 +119,6 @@ void processor_detach(struct scst_device *dev) } #endif -/******************************************************************** - * Function: processor_parse - * - * Argument: - * - * Returns : The state of the command - * - * Description: This does the parsing of the command - * - * Note: Not all states are allowed on return - ********************************************************************/ static int processor_parse(struct scst_cmd *cmd) { int res = SCST_CMD_STATE_DEFAULT; @@ -159,17 +130,6 @@ static int processor_parse(struct scst_cmd *cmd) return res; } -/******************************************************************** - * Function: processor_done - * - * Argument: - * - * Returns : - * - * Description: This is the completion routine for the command, - * it is used to extract any necessary information - * about a command. - ********************************************************************/ #if 0 int processor_done(struct scst_cmd *cmd) { diff --git a/scst/src/dev_handlers/scst_raid.c b/scst/src/dev_handlers/scst_raid.c index fd4dfcc24..16426b636 100644 --- a/scst/src/dev_handlers/scst_raid.c +++ b/scst/src/dev_handlers/scst_raid.c @@ -55,15 +55,6 @@ static struct scst_dev_type raid_devtype = { #endif }; -/************************************************************** - * Function: raid_attach - * - * Argument: - * - * Returns : 1 if attached, error code otherwise - * - * Description: - *************************************************************/ static int raid_attach(struct scst_device *dev) { int res, rc; @@ -118,15 +109,6 @@ out: return res; } -/************************************************************ - * Function: raid_detach - * - * Argument: - * - * Returns : None - * - * Description: Called to detach this device type driver - ************************************************************/ #if 0 void raid_detach(struct scst_device *dev) { @@ -137,17 +119,6 @@ void raid_detach(struct scst_device *dev) } #endif -/******************************************************************** - * Function: raid_parse - * - * Argument: - * - * Returns : The state of the command - * - * Description: This does the parsing of the command - * - * Note: Not all states are allowed on return - ********************************************************************/ static int raid_parse(struct scst_cmd *cmd) { int res = SCST_CMD_STATE_DEFAULT; @@ -159,17 +130,6 @@ static int raid_parse(struct scst_cmd *cmd) return res; } -/******************************************************************** - * Function: raid_done - * - * Argument: - * - * Returns : - * - * Description: This is the completion routine for the command, - * it is used to extract any necessary information - * about a command. - ********************************************************************/ #if 0 int raid_done(struct scst_cmd *cmd) { diff --git a/scst/src/dev_handlers/scst_tape.c b/scst/src/dev_handlers/scst_tape.c index 0a2909bf3..e7649ddde 100644 --- a/scst/src/dev_handlers/scst_tape.c +++ b/scst/src/dev_handlers/scst_tape.c @@ -53,7 +53,7 @@ static int tape_attach(struct scst_device *); static void tape_detach(struct scst_device *); static int tape_parse(struct scst_cmd *); static int tape_done(struct scst_cmd *); -static int tape_exec(struct scst_cmd *); +static int tape_perf_exec(struct scst_cmd *); static struct scst_dev_type tape_devtype = { .name = TAPE_NAME, @@ -80,7 +80,7 @@ static struct scst_dev_type tape_devtype_perf = { .detach = tape_detach, .parse = tape_parse, .dev_done = tape_done, - .exec = tape_exec, + .exec = tape_perf_exec, #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) .default_trace_flags = SCST_DEFAULT_DEV_LOG_FLAGS, .trace_flags = &trace_flag, @@ -150,15 +150,6 @@ static void __exit exit_scst_tape_driver(void) module_init(init_scst_tape_driver); module_exit(exit_scst_tape_driver); -/************************************************************** - * Function: tape_attach - * - * Argument: - * - * Returns : 1 if attached, error code otherwise - * - * Description: - *************************************************************/ static int tape_attach(struct scst_device *dev) { int res, rc; @@ -266,15 +257,6 @@ out: return res; } -/************************************************************ - * Function: tape_detach - * - * Argument: - * - * Returns : None - * - * Description: Called to detach this device type driver - ************************************************************/ static void tape_detach(struct scst_device *dev) { struct tape_params *params = @@ -299,17 +281,6 @@ static int tape_get_block_size(struct scst_cmd *cmd) return params->block_size; } -/******************************************************************** - * Function: tape_parse - * - * Argument: - * - * Returns : The state of the command - * - * Description: This does the parsing of the command - * - * Note: Not all states are allowed on return - ********************************************************************/ static int tape_parse(struct scst_cmd *cmd) { int res = SCST_CMD_STATE_DEFAULT; @@ -332,17 +303,6 @@ static void tape_set_block_size(struct scst_cmd *cmd, int block_size) return; } -/******************************************************************** - * Function: tape_done - * - * Argument: - * - * Returns : - * - * Description: This is the completion routine for the command, - * it is used to extract any necessary information - * about a command. - ********************************************************************/ static int tape_done(struct scst_cmd *cmd) { int opcode = cmd->cdb[0]; @@ -412,17 +372,7 @@ out: return res; } -/******************************************************************** - * Function: tape_exec - * - * Argument: - * - * Returns : - * - * Description: Make SCST do nothing for data READs and WRITES. - * Intended for raw line performance testing - ********************************************************************/ -static int tape_exec(struct scst_cmd *cmd) +static int tape_perf_exec(struct scst_cmd *cmd) { int res = SCST_EXEC_NOT_COMPLETED, rc; int opcode = cmd->cdb[0];