From: Matthew Garrett <mjg59@srcf.ucam.org>
To: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <htejun@gmail.com>,
linux-ide@vger.kernel.org, linux-acpi@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
kristen.c.accardi@intel.com
Subject: Re: [PATCH] libata: Integrate ACPI-based PATA/SATA hotplug - version 4
Date: Tue, 2 Oct 2007 22:20:28 +0100 [thread overview]
Message-ID: <20071002212028.GA967@srcf.ucam.org> (raw)
In-Reply-To: <4702AC3B.2010004@garzik.org>
Fix libata-acpi.c build failure.
Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
---
Sorry, I'd diffed the original against libata-dev master rather than
ALL. This tidies up the changes.
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 6896831..5ebbf16 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -101,7 +101,7 @@ static void ata_acpi_handle_hotplug (struct ata_port *ap, struct kobject *kobj,
{
char event_string[12];
char *envp[] = { event_string, NULL };
- struct ata_eh_info *ehi = &ap->eh_info;
+ struct ata_eh_info *ehi = &ap->link.eh_info;
if (event == 0 || event == 1) {
unsigned long flags;
@@ -127,7 +127,7 @@ static void ata_acpi_dev_notify(acpi_handle handle, u32 event, void *data)
if (dev->sdev)
kobj = &dev->sdev->sdev_gendev.kobj;
- ata_acpi_handle_hotplug (dev->ap, kobj, event);
+ ata_acpi_handle_hotplug (dev->link->ap, kobj, event);
}
static void ata_acpi_ap_notify(acpi_handle handle, u32 event, void *data)
@@ -175,8 +175,8 @@ void ata_acpi_associate(struct ata_host *host)
ata_acpi_ap_notify,
ap);
- for (j = 0; j < ata_port_max_devices(ap); j++) {
- struct ata_device *dev = &ap->device[j];
+ for (j = 0; j < ata_link_max_devices(&ap->link); j++) {
+ struct ata_device *dev = &ap->link.device[j];
if (dev->acpi_handle)
acpi_install_notify_handler (dev->acpi_handle,
--
Matthew Garrett | mjg59@srcf.ucam.org
next prev parent reply other threads:[~2007-10-02 21:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-15 3:01 [PATCH] libata: Integrate ACPI-based PATA/SATA hotplug Matthew Garrett
2007-09-15 17:06 ` [PATCH] libata: Integrate ACPI-based PATA/SATA hotplug - version 2 Matthew Garrett
2007-09-16 12:22 ` Tejun Heo
2007-09-20 22:04 ` Jeff Garzik
2007-09-20 22:21 ` Matthew Garrett
2007-09-21 2:35 ` Tejun Heo
2007-09-21 2:42 ` Matthew Garrett
2007-09-21 2:53 ` Tejun Heo
2007-09-21 2:57 ` Matthew Garrett
2007-09-21 3:08 ` Tejun Heo
2007-09-21 3:12 ` Matthew Garrett
2007-09-21 3:19 ` Tejun Heo
2007-09-24 23:14 ` [PATCH] libata: Integrate ACPI-based PATA/SATA hotplug - version 3 Matthew Garrett
2007-09-27 17:26 ` Kristen Carlson Accardi
2007-09-27 17:55 ` Matthew Garrett
2007-09-27 20:39 ` Henrique de Moraes Holschuh
2007-10-02 15:04 ` Jeff Garzik
2007-10-02 18:46 ` Matthew Garrett
2007-10-02 18:49 ` [PATCH] libata: Integrate ACPI-based PATA/SATA hotplug - version 4 Matthew Garrett
2007-10-02 18:55 ` Jeff Garzik
2007-10-02 20:38 ` Jeff Garzik
2007-10-02 20:42 ` Matthew Garrett
2007-10-02 21:20 ` Matthew Garrett [this message]
2007-10-02 21:23 ` Jeff Garzik
2007-10-03 0:24 ` [PATCH] libata: Integrate ACPI-based PATA/SATA hotplug - version 5 Matthew Garrett
2007-10-03 20:27 ` Jeff Garzik
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=20071002212028.GA967@srcf.ucam.org \
--to=mjg59@srcf.ucam.org \
--cc=akpm@linux-foundation.org \
--cc=htejun@gmail.com \
--cc=jeff@garzik.org \
--cc=kristen.c.accardi@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).