aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-07-16 01:29:40 -0400
committerJeff Garzik <jeff@garzik.org>2007-07-20 08:26:25 -0400
commitf8f1e1cc0cd4d75c73e9a55a0ede8958e4fa14f1 (patch)
tree91eaf4895b09923dc4830fa874de25d9eef105d9
parent1ae463171cc1b1ea6dad7bcb298e96c073e7373e (diff)
libata: reorganize ata_ehi_hotplugged()
__ata_ehi_hotplugged() now has no users. Regorganize ata_ehi_hotplugged() such that a new function ata_ehi_schedule_probe() deals with scheduling probing. ata_ehi_hotplugged() calls it and additionally marks hotplug specific flags. ata_ehi_schedule_probe() will be used laster. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--include/linux/libata.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 16ebdf152c75..74800ad6d81f 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -915,16 +915,17 @@ extern void __ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...);
915extern void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...); 915extern void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...);
916extern void ata_ehi_clear_desc(struct ata_eh_info *ehi); 916extern void ata_ehi_clear_desc(struct ata_eh_info *ehi);
917 917
918static inline void __ata_ehi_hotplugged(struct ata_eh_info *ehi) 918static inline void ata_ehi_schedule_probe(struct ata_eh_info *ehi)
919{ 919{
920 ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK; 920 ehi->flags |= ATA_EHI_RESUME_LINK;
921 ehi->action |= ATA_EH_SOFTRESET; 921 ehi->action |= ATA_EH_SOFTRESET;
922 ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1; 922 ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1;
923} 923}
924 924
925static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) 925static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
926{ 926{
927 __ata_ehi_hotplugged(ehi); 927 ata_ehi_schedule_probe(ehi);
928 ehi->flags |= ATA_EHI_HOTPLUGGED;
928 ehi->err_mask |= AC_ERR_ATA_BUS; 929 ehi->err_mask |= AC_ERR_ATA_BUS;
929} 930}
930 931