From c29c6072afbd660c6037334261a1f99ea2894612 Mon Sep 17 00:00:00 2001 From: Andrew Morton <akpm@osdl.org> Date: Sun, 18 Jan 2004 18:41:52 -0800 Subject: [PATCH] [PATCH] zfcp host adapter patch cleanup From: Martin Schwidefsky <schwidefsky@de.ibm.com> Remove all occurrences of __setup and #ifdef MODULE from the zfcp driver. --- drivers/s390/scsi/zfcp_aux.c | 45 +++++++++++------------------------- drivers/s390/scsi/zfcp_def.h | 5 ---- 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 07ca9e113887..d34923a5b44a 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c @@ -63,6 +63,7 @@ /* accumulated log level (module parameter) */ static u32 loglevel = ZFCP_LOG_LEVEL_DEFAULTS; +static char *device; /*********************** FUNCTION PROTOTYPES *********************************/ /* written against the module interface */ @@ -94,13 +95,14 @@ MODULE_AUTHOR("Heiko Carstens <heiko.carstens@de.ibm.com>, " "Wolfgang Taphorn <taphorn@de.ibm.com>, " "Aron Zeh <arzeh@de.ibm.com>, " "IBM Deutschland Entwicklung GmbH"); -/* what this driver module is about */ MODULE_DESCRIPTION ("FCP (SCSI over Fibre Channel) HBA driver for IBM eServer zSeries"); MODULE_LICENSE("GPL"); -/* log level may be provided as a module parameter */ + +module_param(device, charp, 0); +MODULE_PARM_DESC(device, "specify initial device"); + module_param(loglevel, uint, 0); -/* short explaination of the previous module parameter */ MODULE_PARM_DESC(loglevel, "log levels, 8 nibbles: " "(unassigned) ERP QDIO DIO Config FSF SCSI Other, " @@ -316,18 +318,20 @@ zfcp_in_els_dbf_event(struct zfcp_adapter *adapter, const char *text, #endif } -#ifndef MODULE /** * zfcp_device_setup - setup function * @str: pointer to parameter string * - * Parse the kernel parameter string "zfcp_device=..." + * Parse "device=..." parameter string. */ static int __init zfcp_device_setup(char *str) { char *tmp; + if (!str) + return 0; + tmp = strchr(str, ','); if (!tmp) goto err_out; @@ -344,18 +348,13 @@ zfcp_device_setup(char *str) zfcp_data.init_fcp_lun = simple_strtoull(tmp, &tmp, 0); if (*tmp != '\0') goto err_out; - - zfcp_data.init_is_valid = 1; - goto out; + return 1; err_out: - ZFCP_LOG_NORMAL("Parse error for parameter string %s\n", str); - out: - return 1; + ZFCP_LOG_NORMAL("Parse error for device parameter string %s\n", str); + return 0; } -__setup("zfcp_device=", zfcp_device_setup); - static void __init zfcp_init_device_configure(void) { @@ -397,8 +396,6 @@ zfcp_init_device_configure(void) return; } -#endif /* #ifndef MODULE */ - static int __init zfcp_module_init(void) { @@ -440,10 +437,9 @@ zfcp_module_init(void) ZFCP_LOG_NORMAL("Registering with common I/O layer failed.\n"); goto out_ccw_register; } -#ifndef MODULE - if (zfcp_data.init_is_valid) + + if (zfcp_device_setup(device)) zfcp_init_device_configure(); -#endif goto out; @@ -494,19 +490,6 @@ zfcp_reboot_handler(struct notifier_block *notifier, unsigned long code, #define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG #define ZFCP_LOG_AREA_PREFIX ZFCP_LOG_AREA_PREFIX_CONFIG -#ifndef MODULE -/* zfcp_loglevel boot_parameter */ -static int __init -zfcp_loglevel_setup(char *str) -{ - loglevel = simple_strtoul(str, NULL, 0); - ZFCP_LOG_TRACE("loglevel is 0x%x\n", loglevel); - return 1; /* why just 1? */ -} - -__setup("zfcp_loglevel=", zfcp_loglevel_setup); -#endif /* not MODULE */ - /** * zfcp_get_unit_by_lun - find unit in unit list of port by fcp lun * @port: pointer to port to search for unit diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index 46de393e8f4d..159c01ed6694 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h @@ -801,14 +801,9 @@ struct zfcp_data { struct notifier_block reboot_notifier; /* used to register cleanup functions */ atomic_t loglevel; /* current loglevel */ -#ifndef MODULE /* initial parameters - needed if ipl from a - scsi device is wanted */ char init_busid[BUS_ID_SIZE]; wwn_t init_wwpn; fcp_lun_t init_fcp_lun; - int init_is_valid; -#endif #ifdef ZFCP_STAT_REQSIZES /* Statistical accounting of processed data */ struct list_head read_req_head; -- 2.30.9