aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/libata.h
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-07-03 03:07:26 -0400
committerJeff Garzik <jeff@garzik.org>2006-07-05 22:16:28 -0400
commitc0b6c0377c32fe3f6a2cf1e018db6da8a3b78379 (patch)
tree430b7397deb8013164b313f753b98b7db4505ee5 /include/linux/libata.h
parent1cdaf534f829b8759ba30f97d5e8dceb2ab77ba4 (diff)
[PATCH] libata: separate out __ata_ehi_hotplugged()
Separate out __ata_ehi_hotplugged() from ata_ehi_hotplugged(). The underscored version doesn't set AC_ERR_ATA_BUS. This will be used for resume which is a hotplug event but not an ATA bus error. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r--include/linux/libata.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 36938ae1254d..2aa1398bbd52 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -843,7 +843,7 @@ extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
843 (ehi)->desc_len = 0; \ 843 (ehi)->desc_len = 0; \
844} while (0) 844} while (0)
845 845
846static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) 846static inline void __ata_ehi_hotplugged(struct ata_eh_info *ehi)
847{ 847{
848 if (ehi->flags & ATA_EHI_HOTPLUGGED) 848 if (ehi->flags & ATA_EHI_HOTPLUGGED)
849 return; 849 return;
@@ -851,11 +851,16 @@ static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
851 ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK; 851 ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK;
852 ehi->hotplug_timestamp = jiffies; 852 ehi->hotplug_timestamp = jiffies;
853 853
854 ehi->err_mask |= AC_ERR_ATA_BUS;
855 ehi->action |= ATA_EH_SOFTRESET; 854 ehi->action |= ATA_EH_SOFTRESET;
856 ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1; 855 ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1;
857} 856}
858 857
858static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
859{
860 __ata_ehi_hotplugged(ehi);
861 ehi->err_mask |= AC_ERR_ATA_BUS;
862}
863
859/* 864/*
860 * qc helpers 865 * qc helpers
861 */ 866 */