[SCSI] Maintain module-parameter name consistency with qla2xxx/qla4xxx.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
80f1443c66
commit
11010fecd2
|
@ -38,7 +38,7 @@
|
|||
* Macros use for debugging the driver.
|
||||
*/
|
||||
|
||||
#define DEBUG(x) do { if (qla2_extended_error_logging) { x; } } while (0)
|
||||
#define DEBUG(x) do { if (ql2xextended_error_logging) { x; } } while (0)
|
||||
|
||||
#if defined(QL_DEBUG_LEVEL_1)
|
||||
#define DEBUG1(x) do {x;} while (0)
|
||||
|
@ -46,12 +46,12 @@
|
|||
#define DEBUG1(x) do {} while (0)
|
||||
#endif
|
||||
|
||||
#define DEBUG2(x) do { if (qla2_extended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_3(x) do { if (qla2_extended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_3_11(x) do { if (qla2_extended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_9_10(x) do { if (qla2_extended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_11(x) do { if (qla2_extended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_13(x) do { if (qla2_extended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2(x) do { if (ql2xextended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_3(x) do { if (ql2xextended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_3_11(x) do { if (ql2xextended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_9_10(x) do { if (ql2xextended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_11(x) do { if (ql2xextended_error_logging) { x; } } while (0)
|
||||
#define DEBUG2_13(x) do { if (ql2xextended_error_logging) { x; } } while (0)
|
||||
|
||||
#if defined(QL_DEBUG_LEVEL_3)
|
||||
#define DEBUG3(x) do {x;} while (0)
|
||||
|
|
|
@ -60,7 +60,7 @@ extern int ql2xplogiabsentdevice;
|
|||
extern int ql2xloginretrycount;
|
||||
extern int ql2xfdmienable;
|
||||
extern int ql2xallocfwdump;
|
||||
extern int qla2_extended_error_logging;
|
||||
extern int ql2xextended_error_logging;
|
||||
|
||||
extern void qla2x00_sp_compl(scsi_qla_host_t *, srb_t *);
|
||||
|
||||
|
|
|
@ -1644,7 +1644,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
|
|||
* Set host adapter parameters.
|
||||
*/
|
||||
if (nv->host_p[0] & BIT_7)
|
||||
qla2_extended_error_logging = 1;
|
||||
ql2xextended_error_logging = 1;
|
||||
ha->flags.disable_risc_code_load = ((nv->host_p[0] & BIT_4) ? 1 : 0);
|
||||
/* Always load RISC code on non ISP2[12]00 chips. */
|
||||
if (!IS_QLA2100(ha) && !IS_QLA2200(ha))
|
||||
|
|
|
@ -61,9 +61,9 @@ MODULE_PARM_DESC(ql2xallocfwdump,
|
|||
"during HBA initialization. Memory allocation requirements "
|
||||
"vary by ISP type. Default is 1 - allocate memory.");
|
||||
|
||||
int qla2_extended_error_logging;
|
||||
module_param(qla2_extended_error_logging, int, S_IRUGO|S_IRUSR);
|
||||
MODULE_PARM_DESC(qla2_extended_error_logging,
|
||||
int ql2xextended_error_logging;
|
||||
module_param(ql2xextended_error_logging, int, S_IRUGO|S_IRUSR);
|
||||
MODULE_PARM_DESC(ql2xextended_error_logging,
|
||||
"Option to enable extended error logging, "
|
||||
"Default is 0 - no logging. 1 - log errors.");
|
||||
|
||||
|
@ -2697,7 +2697,7 @@ qla2x00_module_init(void)
|
|||
|
||||
/* Derive version string. */
|
||||
strcpy(qla2x00_version_str, QLA2XXX_VERSION);
|
||||
if (qla2_extended_error_logging)
|
||||
if (ql2xextended_error_logging)
|
||||
strcat(qla2x00_version_str, "-debug");
|
||||
|
||||
qla2xxx_transport_template =
|
||||
|
|
|
@ -22,14 +22,14 @@
|
|||
#endif
|
||||
|
||||
#if defined(QL_DEBUG_LEVEL_2)
|
||||
#define DEBUG2(x) do {if(qla4_extended_error_logging == 2) x;} while (0);
|
||||
#define DEBUG2(x) do {if(ql4xextended_error_logging == 2) x;} while (0);
|
||||
#define DEBUG2_3(x) do {x;} while (0);
|
||||
#else /* */
|
||||
#define DEBUG2(x) do {} while (0);
|
||||
#endif /* */
|
||||
|
||||
#if defined(QL_DEBUG_LEVEL_3)
|
||||
#define DEBUG3(x) do {if(qla4_extended_error_logging == 3) x;} while (0);
|
||||
#define DEBUG3(x) do {if(ql4xextended_error_logging == 3) x;} while (0);
|
||||
#else /* */
|
||||
#define DEBUG3(x) do {} while (0);
|
||||
#if !defined(QL_DEBUG_LEVEL_2)
|
||||
|
|
|
@ -72,7 +72,7 @@ int qla4xxx_reinitialize_ddb_list(struct scsi_qla_host * ha);
|
|||
int qla4xxx_process_ddb_changed(struct scsi_qla_host * ha,
|
||||
uint32_t fw_ddb_index, uint32_t state);
|
||||
|
||||
extern int qla4_extended_error_logging;
|
||||
extern int ql4xextended_error_logging;
|
||||
extern int ql4xdiscoverywait;
|
||||
extern int ql4xdontresethba;
|
||||
#endif /* _QLA4x_GBL_H */
|
||||
|
|
|
@ -701,7 +701,7 @@ void qla4xxx_get_conn_event_log(struct scsi_qla_host * ha)
|
|||
DEBUG3(printk("scsi%ld: Connection Event Log Dump (%d entries):\n",
|
||||
ha->host_no, num_valid_entries));
|
||||
|
||||
if (qla4_extended_error_logging == 3) {
|
||||
if (ql4xextended_error_logging == 3) {
|
||||
if (oldest_entry == 0) {
|
||||
/* Circular Buffer has not wrapped around */
|
||||
for (i=0; i < num_valid_entries; i++) {
|
||||
|
|
|
@ -34,9 +34,9 @@ MODULE_PARM_DESC(ql4xdontresethba,
|
|||
" default it will reset hba :0"
|
||||
" set to 1 to avoid resetting HBA");
|
||||
|
||||
int qla4_extended_error_logging = 0; /* 0 = off, 1 = log errors */
|
||||
module_param(qla4_extended_error_logging, int, S_IRUGO | S_IRUSR);
|
||||
MODULE_PARM_DESC(qla4_extended_error_logging,
|
||||
int ql4xextended_error_logging = 0; /* 0 = off, 1 = log errors */
|
||||
module_param(ql4xextended_error_logging, int, S_IRUGO | S_IRUSR);
|
||||
MODULE_PARM_DESC(ql4xextended_error_logging,
|
||||
"Option to enable extended error logging, "
|
||||
"Default is 0 - no logging, 1 - debug logging");
|
||||
|
||||
|
@ -1714,7 +1714,7 @@ static int __init qla4xxx_module_init(void)
|
|||
|
||||
/* Derive version string. */
|
||||
strcpy(qla4xxx_version_str, QLA4XXX_DRIVER_VERSION);
|
||||
if (qla4_extended_error_logging)
|
||||
if (ql4xextended_error_logging)
|
||||
strcat(qla4xxx_version_str, "-debug");
|
||||
|
||||
qla4xxx_scsi_transport =
|
||||
|
|
Loading…
Reference in New Issue