hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SCSI] zfcp: whitespace cleanup 

Cleanup the whitepace from the entire zfcp driver to prevent
to have those changes in future feature or function patches.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Swen Schillig 2007-09-07 09:15:31 +02:00 committed by James Bottomley
parent 82d1ce505d
commit 41fa2adabc
9 changed files with 165 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/s390/scsi/zfcp_aux.c
View File

@ -891,7 +891,7 @@ zfcp_unit_dequeue(struct zfcp_unit *unit)
/* /*
* Allocates a combined QTCB/fsf_req buffer for erp actions and fcp/SCSI * Allocates a combined QTCB/fsf_req buffer for erp actions and fcp/SCSI
* commands. * commands.
* It also genrates fcp-nameserver request/response buffer and unsolicited * It also genrates fcp-nameserver request/response buffer and unsolicited
* status read fsf_req buffers. * status read fsf_req buffers.
* *
* locks: must only be called with zfcp_data.config_sema taken * locks: must only be called with zfcp_data.config_sema taken
@ -982,7 +982,7 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)
struct zfcp_adapter *adapter; struct zfcp_adapter *adapter;
/* /*
* Note: It is safe to release the list_lock, as any list changes * Note: It is safe to release the list_lock, as any list changes
* are protected by the config_sema, which must be held to get here * are protected by the config_sema, which must be held to get here
*/ */

46
drivers/s390/scsi/zfcp_def.h
View File

@ -1,23 +1,23 @@
/* /*
* This file is part of the zfcp device driver for * This file is part of the zfcp device driver for
* FCP adapters for IBM System z9 and zSeries. * FCP adapters for IBM System z9 and zSeries.
* *
* (C) Copyright IBM Corp. 2002, 2006 * (C) Copyright IBM Corp. 2002, 2006
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option) * the Free Software Foundation; either version 2, or (at your option)
* any later version. * any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef ZFCP_DEF_H #ifndef ZFCP_DEF_H
#define ZFCP_DEF_H #define ZFCP_DEF_H
@ -90,7 +90,7 @@ zfcp_address_to_sg(void *address, struct scatterlist *list)
#define ZFCP_DEVICE_TYPE 0x1732 #define ZFCP_DEVICE_TYPE 0x1732
#define ZFCP_DEVICE_MODEL 0x03 #define ZFCP_DEVICE_MODEL 0x03
#define ZFCP_DEVICE_MODEL_PRIV 0x04 #define ZFCP_DEVICE_MODEL_PRIV 0x04
/* allow as many chained SBALs as are supported by hardware */ /* allow as many chained SBALs as are supported by hardware */
#define ZFCP_MAX_SBALS_PER_REQ FSF_MAX_SBALS_PER_REQ #define ZFCP_MAX_SBALS_PER_REQ FSF_MAX_SBALS_PER_REQ
#define ZFCP_MAX_SBALS_PER_CT_REQ FSF_MAX_SBALS_PER_REQ #define ZFCP_MAX_SBALS_PER_CT_REQ FSF_MAX_SBALS_PER_REQ
@ -508,7 +508,7 @@ struct zfcp_rc_entry {
/* /*
* this allows removal of logging code by the preprocessor * this allows removal of logging code by the preprocessor
* (the most detailed log level still to be compiled in is specified, * (the most detailed log level still to be compiled in is specified,
* higher log levels are removed) * higher log levels are removed)
*/ */
#define ZFCP_LOG_LEVEL_LIMIT ZFCP_LOG_LEVEL_TRACE #define ZFCP_LOG_LEVEL_LIMIT ZFCP_LOG_LEVEL_TRACE
@ -546,7 +546,7 @@ do { \
if (ZFCP_LOG_CHECK(level)) \ if (ZFCP_LOG_CHECK(level)) \
_ZFCP_LOG(fmt, ##args); \ _ZFCP_LOG(fmt, ##args); \
} while (0) } while (0)
#if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_NORMAL #if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_NORMAL
# define ZFCP_LOG_NORMAL(fmt, args...) do { } while (0) # define ZFCP_LOG_NORMAL(fmt, args...) do { } while (0)
#else #else
@ -583,8 +583,8 @@ do { \
/*************** ADAPTER/PORT/UNIT AND FSF_REQ STATUS FLAGS ******************/ /*************** ADAPTER/PORT/UNIT AND FSF_REQ STATUS FLAGS ******************/
/* /*
* Note, the leftmost status byte is common among adapter, port * Note, the leftmost status byte is common among adapter, port
* and unit * and unit
*/ */
#define ZFCP_COMMON_FLAGS 0xfff00000 #define ZFCP_COMMON_FLAGS 0xfff00000
@ -1007,8 +1007,8 @@ struct zfcp_fsf_req {
u32 fsf_command; /* FSF Command copy */ u32 fsf_command; /* FSF Command copy */
struct fsf_qtcb *qtcb; /* address of associated QTCB */ struct fsf_qtcb *qtcb; /* address of associated QTCB */
u32 seq_no; /* Sequence number of request */ u32 seq_no; /* Sequence number of request */
unsigned long data; /* private data of request */ unsigned long data; /* private data of request */
struct timer_list timer; /* used for erp or scsi er */ struct timer_list timer; /* used for erp or scsi er */
struct zfcp_erp_action *erp_action; /* used if this request is struct zfcp_erp_action *erp_action; /* used if this request is
issued on behalf of erp */ issued on behalf of erp */
mempool_t *pool; /* used if request was alloacted mempool_t *pool; /* used if request was alloacted

134
drivers/s390/scsi/zfcp_erp.c
View File

@ -1,22 +1,22 @@
/* /*
* This file is part of the zfcp device driver for * This file is part of the zfcp device driver for
* FCP adapters for IBM System z9 and zSeries. * FCP adapters for IBM System z9 and zSeries.
* *
* (C) Copyright IBM Corp. 2002, 2006 * (C) Copyright IBM Corp. 2002, 2006
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option) * the Free Software Foundation; either version 2, or (at your option)
* any later version. * any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_ERP #define ZFCP_LOG_AREA ZFCP_LOG_AREA_ERP
@ -191,7 +191,7 @@ void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req, unsigned long timeout)
} }
/* /*
* function: * function:
* *
* purpose: called if an adapter failed, * purpose: called if an adapter failed,
* initiates adapter recovery which is done * initiates adapter recovery which is done
@ -228,7 +228,7 @@ zfcp_erp_adapter_reopen_internal(struct zfcp_adapter *adapter, int clear_mask)
} }
/* /*
* function: * function:
* *
* purpose: Wrappper for zfcp_erp_adapter_reopen_internal * purpose: Wrappper for zfcp_erp_adapter_reopen_internal
* used to ensure the correct locking * used to ensure the correct locking
@ -476,7 +476,7 @@ zfcp_test_link(struct zfcp_port *port)
/* /*
* function: * function:
* *
* purpose: called if a port failed to be opened normally * purpose: called if a port failed to be opened normally
* initiates Forced Reopen recovery which is done * initiates Forced Reopen recovery which is done
@ -517,7 +517,7 @@ zfcp_erp_port_forced_reopen_internal(struct zfcp_port *port, int clear_mask)
} }
/* /*
* function: * function:
* *
* purpose: Wrappper for zfcp_erp_port_forced_reopen_internal * purpose: Wrappper for zfcp_erp_port_forced_reopen_internal
* used to ensure the correct locking * used to ensure the correct locking
@ -543,7 +543,7 @@ zfcp_erp_port_forced_reopen(struct zfcp_port *port, int clear_mask)
} }
/* /*
* function: * function:
* *
* purpose: called if a port is to be opened * purpose: called if a port is to be opened
* initiates Reopen recovery which is done * initiates Reopen recovery which is done
@ -612,7 +612,7 @@ zfcp_erp_port_reopen(struct zfcp_port *port, int clear_mask)
} }
/* /*
* function: * function:
* *
* purpose: called if a unit is to be opened * purpose: called if a unit is to be opened
* initiates Reopen recovery which is done * initiates Reopen recovery which is done
@ -704,7 +704,7 @@ static void zfcp_erp_adapter_unblock(struct zfcp_adapter *adapter)
} }
/* /*
* function: * function:
* *
* purpose: disable I/O, * purpose: disable I/O,
* return any open requests and clean them up, * return any open requests and clean them up,
@ -725,7 +725,7 @@ zfcp_erp_port_block(struct zfcp_port *port, int clear_mask)
} }
/* /*
* function: * function:
* *
* purpose: enable I/O * purpose: enable I/O
* *
@ -742,7 +742,7 @@ zfcp_erp_port_unblock(struct zfcp_port *port)
} }
/* /*
* function: * function:
* *
* purpose: disable I/O, * purpose: disable I/O,
* return any open requests and clean them up, * return any open requests and clean them up,
@ -763,7 +763,7 @@ zfcp_erp_unit_block(struct zfcp_unit *unit, int clear_mask)
} }
/* /*
* function: * function:
* *
* purpose: enable I/O * purpose: enable I/O
* *
@ -792,7 +792,7 @@ zfcp_erp_action_ready(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
@ -967,7 +967,7 @@ void zfcp_erp_timeout_handler(unsigned long data)
* zfcp_erp_action_dismiss - dismiss an erp_action * zfcp_erp_action_dismiss - dismiss an erp_action
* *
* adapter->erp_lock must be held * adapter->erp_lock must be held
* *
* Dismissal of an erp_action is usually required if an erp_action of * Dismissal of an erp_action is usually required if an erp_action of
* higher priority is generated. * higher priority is generated.
*/ */
@ -1005,9 +1005,9 @@ zfcp_erp_thread_setup(struct zfcp_adapter *adapter)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: * returns:
* *
@ -1094,7 +1094,7 @@ zfcp_erp_thread(void *data)
} }
/* /*
* function: * function:
* *
* purpose: drives single error recovery action and schedules higher and * purpose: drives single error recovery action and schedules higher and
* subordinate actions, if necessary * subordinate actions, if necessary
@ -1206,7 +1206,7 @@ zfcp_erp_strategy(struct zfcp_erp_action *erp_action)
/* /*
* put this target through the erp mill again if someone has * put this target through the erp mill again if someone has
* requested to change the status of a target being online * requested to change the status of a target being online
* to offline or the other way around * to offline or the other way around
* (old retval is preserved if nothing has to be done here) * (old retval is preserved if nothing has to be done here)
*/ */
@ -1228,7 +1228,7 @@ zfcp_erp_strategy(struct zfcp_erp_action *erp_action)
unlock: unlock:
write_unlock(&adapter->erp_lock); write_unlock(&adapter->erp_lock);
read_unlock_irqrestore(&zfcp_data.config_lock, flags); read_unlock_irqrestore(&zfcp_data.config_lock, flags);
if (retval != ZFCP_ERP_CONTINUES) if (retval != ZFCP_ERP_CONTINUES)
zfcp_erp_action_cleanup(action, adapter, port, unit, retval); zfcp_erp_action_cleanup(action, adapter, port, unit, retval);
@ -1250,9 +1250,9 @@ zfcp_erp_strategy(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_DISMISSED - if action has been dismissed * returns: ZFCP_ERP_DISMISSED - if action has been dismissed
* retval - otherwise * retval - otherwise
@ -1322,7 +1322,7 @@ zfcp_erp_strategy_do_action(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: triggers retry of this action after a certain amount of time * purpose: triggers retry of this action after a certain amount of time
* by means of timer provided by erp_action * by means of timer provided by erp_action
@ -1346,7 +1346,7 @@ zfcp_erp_strategy_memwait(struct zfcp_erp_action *erp_action)
return retval; return retval;
} }
/* /*
* function: zfcp_erp_adapter_failed * function: zfcp_erp_adapter_failed
* *
* purpose: sets the adapter and all underlying devices to ERP_FAILED * purpose: sets the adapter and all underlying devices to ERP_FAILED
@ -1362,7 +1362,7 @@ zfcp_erp_adapter_failed(struct zfcp_adapter *adapter)
debug_text_event(adapter->erp_dbf, 2, "a_afail"); debug_text_event(adapter->erp_dbf, 2, "a_afail");
} }
/* /*
* function: zfcp_erp_port_failed * function: zfcp_erp_port_failed
* *
* purpose: sets the port and all underlying devices to ERP_FAILED * purpose: sets the port and all underlying devices to ERP_FAILED
@ -1386,7 +1386,7 @@ zfcp_erp_port_failed(struct zfcp_port *port)
debug_event(port->adapter->erp_dbf, 2, &port->wwpn, sizeof (wwn_t)); debug_event(port->adapter->erp_dbf, 2, &port->wwpn, sizeof (wwn_t));
} }
/* /*
* function: zfcp_erp_unit_failed * function: zfcp_erp_unit_failed
* *
* purpose: sets the unit to ERP_FAILED * purpose: sets the unit to ERP_FAILED
@ -1417,7 +1417,7 @@ zfcp_erp_unit_failed(struct zfcp_unit *unit)
* successfully is reset. * successfully is reset.
* *
* returns: ZFCP_ERP_CONTINUES - action continues (not considered) * returns: ZFCP_ERP_CONTINUES - action continues (not considered)
* ZFCP_ERP_SUCCEEDED - action finished successfully * ZFCP_ERP_SUCCEEDED - action finished successfully
* ZFCP_ERP_EXIT - action failed and will not continue * ZFCP_ERP_EXIT - action failed and will not continue
*/ */
static int static int
@ -1646,7 +1646,7 @@ zfcp_erp_schedule_work(struct zfcp_unit *unit)
} }
/* /*
* function: * function:
* *
* purpose: remaining things in good cases, * purpose: remaining things in good cases,
* escalation in bad cases * escalation in bad cases
@ -1815,7 +1815,7 @@ zfcp_erp_modify_unit_status(struct zfcp_unit *unit, u32 mask, int set_or_clear)
} }
/* /*
* function: * function:
* *
* purpose: Wrappper for zfcp_erp_port_reopen_all_internal * purpose: Wrappper for zfcp_erp_port_reopen_all_internal
* used to ensure the correct locking * used to ensure the correct locking
@ -1852,9 +1852,9 @@ zfcp_erp_port_reopen_all_internal(struct zfcp_adapter *adapter, int clear_mask)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: FIXME * returns: FIXME
*/ */
@ -1871,7 +1871,7 @@ zfcp_erp_unit_reopen_all_internal(struct zfcp_port *port, int clear_mask)
} }
/* /*
* function: * function:
* *
* purpose: this routine executes the 'Reopen Adapter' action * purpose: this routine executes the 'Reopen Adapter' action
* (the entire action is processed synchronously, since * (the entire action is processed synchronously, since
@ -1908,9 +1908,9 @@ zfcp_erp_adapter_strategy(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_SUCCEEDED - action finished successfully * returns: ZFCP_ERP_SUCCEEDED - action finished successfully
* ZFCP_ERP_FAILED - action finished unsuccessfully * ZFCP_ERP_FAILED - action finished unsuccessfully
@ -1930,9 +1930,9 @@ zfcp_erp_adapter_strategy_close(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_SUCCEEDED - action finished successfully * returns: ZFCP_ERP_SUCCEEDED - action finished successfully
* ZFCP_ERP_FAILED - action finished unsuccessfully * ZFCP_ERP_FAILED - action finished unsuccessfully
@ -1957,7 +1957,7 @@ zfcp_erp_adapter_strategy_open(struct zfcp_erp_action *erp_action)
* purpose: allocate the irq associated with this devno and register * purpose: allocate the irq associated with this devno and register
* the FSF adapter with the SCSI stack * the FSF adapter with the SCSI stack
* *
* returns: * returns:
*/ */
static int static int
zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *erp_action, int close) zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *erp_action, int close)
@ -2249,7 +2249,7 @@ zfcp_erp_adapter_strategy_open_fsf_statusread(struct zfcp_erp_action
} }
/* /*
* function: * function:
* *
* purpose: this routine executes the 'Reopen Physical Port' action * purpose: this routine executes the 'Reopen Physical Port' action
* *
@ -2308,7 +2308,7 @@ zfcp_erp_port_forced_strategy(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: this routine executes the 'Reopen Port' action * purpose: this routine executes the 'Reopen Port' action
* *
@ -2530,7 +2530,7 @@ zfcp_erp_port_strategy_open_nameserver(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: makes the erp thread continue with reopen (physical) port * purpose: makes the erp thread continue with reopen (physical) port
* actions which have been paused until the name server port * actions which have been paused until the name server port
@ -2570,9 +2570,9 @@ zfcp_erp_port_strategy_open_nameserver_wakeup(struct zfcp_erp_action
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_CONTINUES - action continues (asynchronously) * returns: ZFCP_ERP_CONTINUES - action continues (asynchronously)
* ZFCP_ERP_FAILED - action finished unsuccessfully * ZFCP_ERP_FAILED - action finished unsuccessfully
@ -2626,9 +2626,9 @@ zfcp_erp_port_strategy_clearstati(struct zfcp_port *port)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_CONTINUES - action continues (asynchronously) * returns: ZFCP_ERP_CONTINUES - action continues (asynchronously)
* ZFCP_ERP_FAILED - action finished unsuccessfully * ZFCP_ERP_FAILED - action finished unsuccessfully
@ -2663,9 +2663,9 @@ zfcp_erp_port_strategy_close(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_CONTINUES - action continues (asynchronously) * returns: ZFCP_ERP_CONTINUES - action continues (asynchronously)
* ZFCP_ERP_FAILED - action finished unsuccessfully * ZFCP_ERP_FAILED - action finished unsuccessfully
@ -2700,9 +2700,9 @@ zfcp_erp_port_strategy_open_port(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_CONTINUES - action continues (asynchronously) * returns: ZFCP_ERP_CONTINUES - action continues (asynchronously)
* ZFCP_ERP_FAILED - action finished unsuccessfully * ZFCP_ERP_FAILED - action finished unsuccessfully
@ -2737,7 +2737,7 @@ zfcp_erp_port_strategy_open_common_lookup(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: this routine executes the 'Reopen Unit' action * purpose: this routine executes the 'Reopen Unit' action
* currently no retries * currently no retries
@ -2825,9 +2825,9 @@ zfcp_erp_unit_strategy_clearstati(struct zfcp_unit *unit)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_CONTINUES - action continues (asynchronously) * returns: ZFCP_ERP_CONTINUES - action continues (asynchronously)
* ZFCP_ERP_FAILED - action finished unsuccessfully * ZFCP_ERP_FAILED - action finished unsuccessfully
@ -2865,9 +2865,9 @@ zfcp_erp_unit_strategy_close(struct zfcp_erp_action *erp_action)
} }
/* /*
* function: * function:
* *
* purpose: * purpose:
* *
* returns: ZFCP_ERP_CONTINUES - action continues (asynchronously) * returns: ZFCP_ERP_CONTINUES - action continues (asynchronously)
* ZFCP_ERP_FAILED - action finished unsuccessfully * ZFCP_ERP_FAILED - action finished unsuccessfully
@ -2913,7 +2913,7 @@ void zfcp_erp_start_timer(struct zfcp_fsf_req *fsf_req)
} }
/* /*
* function: * function:
* *
* purpose: enqueue the specified error recovery action, if needed * purpose: enqueue the specified error recovery action, if needed
* *
@ -2992,7 +2992,7 @@ zfcp_erp_action_enqueue(int action,
port->erp_action.action); port->erp_action.action);
debug_text_event(adapter->erp_dbf, 4, debug_text_event(adapter->erp_dbf, 4,
"pf_actenq_drp"); "pf_actenq_drp");
} else } else
debug_text_event(adapter->erp_dbf, 4, debug_text_event(adapter->erp_dbf, 4,
"pf_actenq_drpcp"); "pf_actenq_drpcp");
debug_event(adapter->erp_dbf, 4, &port->wwpn, debug_event(adapter->erp_dbf, 4, &port->wwpn,

30
drivers/s390/scsi/zfcp_ext.h
View File

@ -1,22 +1,22 @@
/* /*
* This file is part of the zfcp device driver for * This file is part of the zfcp device driver for
* FCP adapters for IBM System z9 and zSeries. * FCP adapters for IBM System z9 and zSeries.
* *
* (C) Copyright IBM Corp. 2002, 2006 * (C) Copyright IBM Corp. 2002, 2006
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option) * the Free Software Foundation; either version 2, or (at your option)
* any later version. * any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef ZFCP_EXT_H #ifndef ZFCP_EXT_H

40
drivers/s390/scsi/zfcp_fsf.c
View File

@ -80,10 +80,10 @@ static const char zfcp_act_subtable_type[5][8] = {
/* /*
* function: zfcp_fsf_req_alloc * function: zfcp_fsf_req_alloc
* *
* purpose: Obtains an fsf_req and potentially a qtcb (for all but * purpose: Obtains an fsf_req and potentially a qtcb (for all but
* unsolicited requests) via helper functions * unsolicited requests) via helper functions
* Does some initial fsf request set-up. * Does some initial fsf request set-up.
* *
* returns: pointer to allocated fsf_req if successfull * returns: pointer to allocated fsf_req if successfull
* NULL otherwise * NULL otherwise
* *
@ -192,7 +192,7 @@ void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *adapter)
* returns: 0 - success * returns: 0 - success
* !0 - failure * !0 - failure
* *
* context: * context:
*/ */
int int
zfcp_fsf_req_complete(struct zfcp_fsf_req *fsf_req) zfcp_fsf_req_complete(struct zfcp_fsf_req *fsf_req)
@ -214,8 +214,8 @@ zfcp_fsf_req_complete(struct zfcp_fsf_req *fsf_req)
} }
/* /*
* fsf_req may be deleted due to waking up functions, so * fsf_req may be deleted due to waking up functions, so
* cleanup is saved here and used later * cleanup is saved here and used later
*/ */
if (likely(fsf_req->status & ZFCP_STATUS_FSFREQ_CLEANUP)) if (likely(fsf_req->status & ZFCP_STATUS_FSFREQ_CLEANUP))
cleanup = 1; cleanup = 1;
@ -259,9 +259,9 @@ zfcp_fsf_req_complete(struct zfcp_fsf_req *fsf_req)
* and initiates appropriate actions * and initiates appropriate actions
* (usually calling FSF command specific handlers) * (usually calling FSF command specific handlers)
* *
* returns: * returns:
* *
* context: * context:
* *
* locks: * locks:
*/ */
@ -638,7 +638,7 @@ zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter,
* *
* purpose: calls the appropriate command specific handler * purpose: calls the appropriate command specific handler
* *
* returns: * returns:
*/ */
static int static int
zfcp_fsf_req_dispatch(struct zfcp_fsf_req *fsf_req) zfcp_fsf_req_dispatch(struct zfcp_fsf_req *fsf_req)
@ -854,7 +854,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req)
* *
* purpose: is called for finished Open Port command * purpose: is called for finished Open Port command
* *
* returns: * returns:
*/ */
static int static int
zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req) zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
@ -1088,7 +1088,7 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
* returns: address of initiated FSF request * returns: address of initiated FSF request
* NULL - request could not be initiated * NULL - request could not be initiated
* *
* FIXME(design): should be watched by a timeout !!! * FIXME(design): should be watched by a timeout !!!
* FIXME(design) shouldn't this be modified to return an int * FIXME(design) shouldn't this be modified to return an int
* also...don't know how though * also...don't know how though
*/ */
@ -1157,7 +1157,7 @@ zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
* *
* purpose: is called for finished Abort FCP Command request * purpose: is called for finished Abort FCP Command request
* *
* returns: * returns:
*/ */
static int static int
zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req) zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req)
@ -2437,10 +2437,10 @@ zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *fsf_req)
/* /*
* function: zfcp_fsf_open_port * function: zfcp_fsf_open_port
* *
* purpose: * purpose:
* *
* returns: address of initiated FSF request * returns: address of initiated FSF request
* NULL - request could not be initiated * NULL - request could not be initiated
*/ */
int int
zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
@ -2501,7 +2501,7 @@ zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
* *
* purpose: is called for finished Open Port command * purpose: is called for finished Open Port command
* *
* returns: * returns:
*/ */
static int static int
zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req) zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
@ -3103,7 +3103,7 @@ zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)
* *
* purpose: is called for finished Open LUN command * purpose: is called for finished Open LUN command
* *
* returns: * returns:
*/ */
static int static int
zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req) zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
@ -3366,7 +3366,7 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
* purpose: * purpose:
* *
* returns: address of fsf_req - request successfully initiated * returns: address of fsf_req - request successfully initiated
* NULL - * NULL -
* *
* assumptions: This routine does not check whether the associated * assumptions: This routine does not check whether the associated
* remote port/lun has already been opened. This should be * remote port/lun has already been opened. This should be
@ -3828,7 +3828,7 @@ zfcp_fsf_send_fcp_command_task_management(struct zfcp_adapter *adapter,
* *
* purpose: is called for finished Send FCP Command * purpose: is called for finished Send FCP Command
* *
* returns: * returns:
*/ */
static int static int
zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req) zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
@ -4065,7 +4065,7 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
* *
* purpose: evaluates FCP_RSP IU * purpose: evaluates FCP_RSP IU
* *
* returns: * returns:
*/ */
static int static int
zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req) zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req)
@ -4293,7 +4293,7 @@ zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req)
* *
* purpose: evaluates FCP_RSP IU * purpose: evaluates FCP_RSP IU
* *
* returns: * returns:
*/ */
static int static int
zfcp_fsf_send_fcp_command_task_management_handler(struct zfcp_fsf_req *fsf_req) zfcp_fsf_send_fcp_command_task_management_handler(struct zfcp_fsf_req *fsf_req)
@ -4736,7 +4736,7 @@ zfcp_fsf_req_create(struct zfcp_adapter *adapter, u32 fsf_cmd, int req_flags,
INIT_LIST_HEAD(&fsf_req->list); INIT_LIST_HEAD(&fsf_req->list);
init_timer(&fsf_req->timer); init_timer(&fsf_req->timer);
/* initialize waitqueue which may be used to wait on /* initialize waitqueue which may be used to wait on
this request completion */ this request completion */
init_waitqueue_head(&fsf_req->completion_wq); init_waitqueue_head(&fsf_req->completion_wq);

30
drivers/s390/scsi/zfcp_fsf.h
View File

@ -1,22 +1,22 @@
/* /*
* This file is part of the zfcp device driver for * This file is part of the zfcp device driver for
* FCP adapters for IBM System z9 and zSeries. * FCP adapters for IBM System z9 and zSeries.
* *
* (C) Copyright IBM Corp. 2002, 2006 * (C) Copyright IBM Corp. 2002, 2006
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option) * the Free Software Foundation; either version 2, or (at your option)
* any later version. * any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef FSF_H #ifndef FSF_H

7
drivers/s390/scsi/zfcp_qdio.c
View File

@ -174,10 +174,9 @@ zfcp_qdio_handler_error_check(struct zfcp_adapter *adapter, unsigned int status,
* That is why we need to clear the link-down flag * That is why we need to clear the link-down flag
* which is set again in case we have missed by a mile. * which is set again in case we have missed by a mile.
*/ */
zfcp_erp_adapter_reopen( zfcp_erp_adapter_reopen(adapter,
adapter, ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED | ZFCP_STATUS_COMMON_ERP_FAILED);
ZFCP_STATUS_COMMON_ERP_FAILED);
} }
return retval; return retval;
} }

36
drivers/s390/scsi/zfcp_scsi.c
View File

@ -1,22 +1,22 @@
/* /*
* This file is part of the zfcp device driver for * This file is part of the zfcp device driver for
* FCP adapters for IBM System z9 and zSeries. * FCP adapters for IBM System z9 and zSeries.
* *
* (C) Copyright IBM Corp. 2002, 2006 * (C) Copyright IBM Corp. 2002, 2006
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option) * the Free Software Foundation; either version 2, or (at your option)
* any later version. * any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_SCSI #define ZFCP_LOG_AREA ZFCP_LOG_AREA_SCSI
@ -101,7 +101,7 @@ zfcp_get_fcp_dl_ptr(struct fcp_cmnd_iu * fcp_cmd)
((unsigned char *) fcp_cmd + ((unsigned char *) fcp_cmd +
sizeof (struct fcp_cmnd_iu) + additional_length); sizeof (struct fcp_cmnd_iu) + additional_length);
/* /*
* fcp_dl_addr = start address of fcp_cmnd structure + * fcp_dl_addr = start address of fcp_cmnd structure +
* size of fixed part + size of dynamically sized add_dcp_cdb field * size of fixed part + size of dynamically sized add_dcp_cdb field
* SEE FCP-2 documentation * SEE FCP-2 documentation
*/ */
@ -194,7 +194,7 @@ static void zfcp_scsi_slave_destroy(struct scsi_device *sdpnt)
"address %p\n", sdpnt); "address %p\n", sdpnt);
} }
/* /*
* called from scsi midlayer to allow finetuning of a device. * called from scsi midlayer to allow finetuning of a device.
*/ */
static int static int
@ -372,7 +372,7 @@ zfcp_unit_lookup(struct zfcp_adapter *adapter, int channel, unsigned int id,
/** /**
* zfcp_scsi_eh_abort_handler - abort the specified SCSI command * zfcp_scsi_eh_abort_handler - abort the specified SCSI command
* @scpnt: pointer to scsi_cmnd to be aborted * @scpnt: pointer to scsi_cmnd to be aborted
* Return: SUCCESS - command has been aborted and cleaned up in internal * Return: SUCCESS - command has been aborted and cleaned up in internal
* bookkeeping, SCSI stack won't be called for aborted command * bookkeeping, SCSI stack won't be called for aborted command
* FAILED - otherwise * FAILED - otherwise

4
drivers/s390/scsi/zfcp_sysfs_unit.c
View File

@ -139,7 +139,7 @@ static struct attribute_group zfcp_unit_attr_group = {
.attrs = zfcp_unit_attrs, .attrs = zfcp_unit_attrs,
}; };
/** /**
* zfcp_sysfs_create_unit_files - create sysfs unit files * zfcp_sysfs_create_unit_files - create sysfs unit files
* @dev: pointer to belonging device * @dev: pointer to belonging device
* *
@ -151,7 +151,7 @@ zfcp_sysfs_unit_create_files(struct device *dev)
return sysfs_create_group(&dev->kobj, &zfcp_unit_attr_group); return sysfs_create_group(&dev->kobj, &zfcp_unit_attr_group);
} }
/** /**
* zfcp_sysfs_remove_unit_files - remove sysfs unit files * zfcp_sysfs_remove_unit_files - remove sysfs unit files
* @dev: pointer to belonging device * @dev: pointer to belonging device
* *