From: Tejun Heo <htejun@gmail.com>
To: jgarzik@pobox.com, lkml@rtr.ca, axboe@suse.de,
forrest.zhao@intel.com, alan@lxorguk.ukuu.org.uk,
linux-ide@vger.kernel.org
Cc: Tejun Heo <htejun@gmail.com>
Subject: [PATCH 04/11] libata: separate out __ata_ehi_hotplugged()
Date: Mon, 3 Jul 2006 16:07:26 +0900 [thread overview]
Message-ID: <11519104462280-git-send-email-htejun@gmail.com> (raw)
In-Reply-To: <11519104451998-git-send-email-htejun@gmail.com>
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>
---
include/linux/libata.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
05c3b3361ede81cdf6e1331af21baa44f593be9b
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 36938ae..2aa1398 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -843,7 +843,7 @@ #define ata_ehi_clear_desc(ehi) do { \
(ehi)->desc_len = 0; \
} while (0)
-static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
+static inline void __ata_ehi_hotplugged(struct ata_eh_info *ehi)
{
if (ehi->flags & ATA_EHI_HOTPLUGGED)
return;
@@ -851,11 +851,16 @@ static inline void ata_ehi_hotplugged(st
ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK;
ehi->hotplug_timestamp = jiffies;
- ehi->err_mask |= AC_ERR_ATA_BUS;
ehi->action |= ATA_EH_SOFTRESET;
ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1;
}
+static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
+{
+ __ata_ehi_hotplugged(ehi);
+ ehi->err_mask |= AC_ERR_ATA_BUS;
+}
+
/*
* qc helpers
*/
--
1.3.2
next prev parent reply other threads:[~2006-07-03 7:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-03 7:07 [PATCHSET] new Power Management for libata, take 4 Tejun Heo
2006-07-03 7:07 ` [PATCH 01/11] libata: implement ATA_EHI_RESUME_LINK Tejun Heo
2006-07-06 2:16 ` Jeff Garzik
2006-07-03 7:07 ` [PATCH 03/11] libata: implement ATA_EHI_NO_AUTOPSY and QUIET Tejun Heo
2006-07-03 7:07 ` [PATCH 05/11] libata: implement PM EH actions Tejun Heo
2006-07-03 7:07 ` [PATCH 06/11] libata: reimplement per-dev PM Tejun Heo
2006-07-03 7:07 ` [PATCH 02/11] libata: clean up debounce parameters and improve parameter selection Tejun Heo
2006-07-03 7:07 ` Tejun Heo [this message]
2006-07-03 7:07 ` [PATCH 10/11] sata_sil24: separate out sil24_init_controller() Tejun Heo
2006-07-03 7:07 ` [PATCH 09/11] sata_sil: add suspend/sleep support Tejun Heo
2006-07-03 7:07 ` [PATCH 11/11] sata_sil24: " Tejun Heo
2006-07-03 7:07 ` [PATCH 07/11] libata: reimplement controller-wide PM Tejun Heo
2006-07-03 7:07 ` [PATCH 08/11] sata_sil: separate out sil_init_controller() Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11519104462280-git-send-email-htejun@gmail.com \
--to=htejun@gmail.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=axboe@suse.de \
--cc=forrest.zhao@intel.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=lkml@rtr.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.