lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] aacraid: rename check_reset

Browse Source 
Too generic, clashes with ISDN.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Mark Salyzyn <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Andrew Morton
2007-08-10 14:50:30 -07:00
committed by James Bottomley
parent a0a74e4505
commit 87f3bda35e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/aacraid/aachba.c
View File

@@ -177,9 +177,9 @@ int check_interval = 24 * 60 * 60;
module_param(check_interval, int, S_IRUGO|S_IWUSR); module_param(check_interval, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(check_interval, "Interval in seconds between adapter health checks."); MODULE_PARM_DESC(check_interval, "Interval in seconds between adapter health checks.");
int check_reset = 1; int aac_check_reset = 1;
module_param(check_reset, int, S_IRUGO|S_IWUSR); module_param_named(check_reset, aac_check_reset, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(check_reset, "If adapter fails health check, reset the adapter."); MODULE_PARM_DESC(aac_check_reset, "If adapter fails health check, reset the adapter.");
int expose_physicals = -1; int expose_physicals = -1;
module_param(expose_physicals, int, S_IRUGO|S_IWUSR); module_param(expose_physicals, int, S_IRUGO|S_IWUSR);
@@ -1305,7 +1305,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
(int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid), (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),
dev->supplement_adapter_info.VpdInfo.Tsid); dev->supplement_adapter_info.VpdInfo.Tsid);
} }
if (!check_reset || if (!aac_check_reset ||
(dev->supplement_adapter_info.SupportedOptions2 & (dev->supplement_adapter_info.SupportedOptions2 &
le32_to_cpu(AAC_OPTION_IGNORE_RESET))) { le32_to_cpu(AAC_OPTION_IGNORE_RESET))) {
printk(KERN_INFO "%s%d: Reset Adapter Ignored\n", printk(KERN_INFO "%s%d: Reset Adapter Ignored\n",

2
drivers/scsi/aacraid/aacraid.h
View File

@@ -1871,4 +1871,4 @@ extern int aac_reset_devices;
extern int aac_commit; extern int aac_commit;
extern int update_interval; extern int update_interval;
extern int check_interval; extern int check_interval;
extern int check_reset; extern int aac_check_reset;

5
drivers/scsi/aacraid/commsup.c
View File

@@ -1372,8 +1372,9 @@ int aac_check_health(struct aac_dev * aac)
printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED); printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED);
if (!check_reset || (aac->supplement_adapter_info.SupportedOptions2 & if (!aac_check_reset ||
le32_to_cpu(AAC_OPTION_IGNORE_RESET))) (aac->supplement_adapter_info.SupportedOptions2 &
le32_to_cpu(AAC_OPTION_IGNORE_RESET)))
goto out; goto out;
host = aac->scsi_host_ptr; host = aac->scsi_host_ptr;
if (aac->thread->pid != current->pid) if (aac->thread->pid != current->pid)