diff options
author | Tejun Heo <htejun@gmail.com> | 2006-07-03 03:07:26 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-05 22:16:27 -0400 |
commit | 1cdaf534f829b8759ba30f97d5e8dceb2ab77ba4 (patch) | |
tree | 4cad6cd3a04d3c10ab42e7d2c76c8f6e2467e506 /drivers/scsi/libata-core.c | |
parent | e9c839142d698086d3fe33a0daafde55ddd00c4e (diff) |
[PATCH] libata: implement ATA_EHI_NO_AUTOPSY and QUIET
Implement ATA_EHI_NO_AUTOPSY and QUIET. These used to be implied by
ATA_PFLAG_LOADING, but new power management and PMP support need to
use these separately. e.g. Suspend/resume operations shouldn't print
full EH messages and resume shouldn't be recorded as an error.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r-- | drivers/scsi/libata-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 73174452d1c1..f368536f8e91 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
@@ -5447,6 +5447,7 @@ int ata_device_add(const struct ata_probe_ent *ent) | |||
5447 | } | 5447 | } |
5448 | 5448 | ||
5449 | if (ap->ops->error_handler) { | 5449 | if (ap->ops->error_handler) { |
5450 | struct ata_eh_info *ehi = &ap->eh_info; | ||
5450 | unsigned long flags; | 5451 | unsigned long flags; |
5451 | 5452 | ||
5452 | ata_port_probe(ap); | 5453 | ata_port_probe(ap); |
@@ -5454,8 +5455,9 @@ int ata_device_add(const struct ata_probe_ent *ent) | |||
5454 | /* kick EH for boot probing */ | 5455 | /* kick EH for boot probing */ |
5455 | spin_lock_irqsave(ap->lock, flags); | 5456 | spin_lock_irqsave(ap->lock, flags); |
5456 | 5457 | ||
5457 | ap->eh_info.probe_mask = (1 << ATA_MAX_DEVICES) - 1; | 5458 | ehi->probe_mask = (1 << ATA_MAX_DEVICES) - 1; |
5458 | ap->eh_info.action |= ATA_EH_SOFTRESET; | 5459 | ehi->action |= ATA_EH_SOFTRESET; |
5460 | ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; | ||
5459 | 5461 | ||
5460 | ap->pflags |= ATA_PFLAG_LOADING; | 5462 | ap->pflags |= ATA_PFLAG_LOADING; |
5461 | ata_port_schedule_eh(ap); | 5463 | ata_port_schedule_eh(ap); |