diff options
author | Tejun Heo <htejun@gmail.com> | 2008-01-23 10:05:14 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:16 -0400 |
commit | b558edddb1c42c70a30cfe494984d4be409f7b2b (patch) | |
tree | b03275d15675a519de7d4edde709892f885a5fa0 /drivers/ata/libata-core.c | |
parent | 8cebf274dd1c955a6e03385a85fd6569ce445946 (diff) |
libata: kill ata_ehi_schedule_probe()
ata_ehi_schedule_probe() was created to hide details of link-resuming
reset magic. Now that all the softreset workarounds are gone,
scheduling probe is very simple - set probe_mask and request RESET.
Kill ata_ehi_schedule_probe() and open code it. This also increases
consistency as ata_ehi_schedule_probe() couldn't cover individual
device probings so they were open-coded even when the helper existed.
While at it, define ATA_ALL_DEVICES as mask of all possible devices on
a link and always use it when requesting probe on link level for
simplicity and consistency. Setting extra bits in the probe_mask
doesn't hurt anybody.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index baef749ec528..4dc429fd0056 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -7156,8 +7156,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) | |||
7156 | /* kick EH for boot probing */ | 7156 | /* kick EH for boot probing */ |
7157 | spin_lock_irqsave(ap->lock, flags); | 7157 | spin_lock_irqsave(ap->lock, flags); |
7158 | 7158 | ||
7159 | ehi->probe_mask = | 7159 | ehi->probe_mask |= ATA_ALL_DEVICES; |
7160 | (1 << ata_link_max_devices(&ap->link)) - 1; | ||
7161 | ehi->action |= ATA_EH_RESET; | 7160 | ehi->action |= ATA_EH_RESET; |
7162 | ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; | 7161 | ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; |
7163 | 7162 | ||