aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-01-23 10:05:14 -0500
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:16 -0400
commit672b2d65ba83a6f3f801fd3d58851aa9c0725a54 (patch)
treeed3a2fe8013bf8322df637838deccf9f2bc9c92c /include/linux
parentd692abd92f22a81b38d52c39601871003262841c (diff)
libata: kill ATA_EHI_RESUME_LINK
ATA_EHI_RESUME_LINK has two functions - promote reset to hardreset if ATA_LFLAG_HRST_TO_RESUME is set and preventing EH from shortcutting reset action when probing is requested. The former is gone now and the latter can easily be achieved by making EH to perform at least one reset if reset is requested, which also makes more sense than depending on RESUME_LINK flag. As ATA_EHI_RESUME_LINK was the only EHI reset modifier, this also kills reset modifier handling. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/libata.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 1524af6f018b..4093e3b6a8b7 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -301,7 +301,6 @@ enum {
301 301
302 /* ata_eh_info->flags */ 302 /* ata_eh_info->flags */
303 ATA_EHI_HOTPLUGGED = (1 << 0), /* could have been hotplugged */ 303 ATA_EHI_HOTPLUGGED = (1 << 0), /* could have been hotplugged */
304 ATA_EHI_RESUME_LINK = (1 << 1), /* resume link (reset modifier) */
305 ATA_EHI_NO_AUTOPSY = (1 << 2), /* no autopsy */ 304 ATA_EHI_NO_AUTOPSY = (1 << 2), /* no autopsy */
306 ATA_EHI_QUIET = (1 << 3), /* be quiet */ 305 ATA_EHI_QUIET = (1 << 3), /* be quiet */
307 306
@@ -312,7 +311,6 @@ enum {
312 ATA_EHI_POST_SETMODE = (1 << 20), /* revaildating after setmode */ 311 ATA_EHI_POST_SETMODE = (1 << 20), /* revaildating after setmode */
313 312
314 ATA_EHI_DID_RESET = ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET, 313 ATA_EHI_DID_RESET = ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,
315 ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
316 314
317 /* max tries if error condition is still set after ->error_handler */ 315 /* max tries if error condition is still set after ->error_handler */
318 ATA_EH_MAX_TRIES = 5, 316 ATA_EH_MAX_TRIES = 5,
@@ -1095,7 +1093,6 @@ extern void ata_ehi_clear_desc(struct ata_eh_info *ehi);
1095 1093
1096static inline void ata_ehi_schedule_probe(struct ata_eh_info *ehi) 1094static inline void ata_ehi_schedule_probe(struct ata_eh_info *ehi)
1097{ 1095{
1098 ehi->flags |= ATA_EHI_RESUME_LINK;
1099 ehi->action |= ATA_EH_RESET; 1096 ehi->action |= ATA_EH_RESET;
1100 ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1; 1097 ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1;
1101} 1098}