linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lin Ming <ming.m.lin@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>, Aaron Lu <aaron.lu@amd.com>,
	Holger Macht <holger@homac.de>, Matthew Garrett <mjg@redhat.com>,
	Alan Cox <alan@lxorguk.ukuu.org.uk>,
	David Woodhouse <David.Woodhouse@intel.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
	linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org,
	linux-acpi@vger.kernel.org
Subject: [PATCH v5 04/12] libata: use correct PCI devices
Date: Mon, 18 Jun 2012 14:25:58 +0800	[thread overview]
Message-ID: <1340000766-129148-5-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1340000766-129148-1-git-send-email-ming.m.lin@intel.com>

From: Holger Macht <holger@homac.de>

Commit 9a6d6a2ddabbd32c07f6a38b659e5f3db319fa5a made ata ports parent
devices of scsi hosts, so we need to go yet another level up to be able
to use the correct PCI devices.

Signed-off-by: Holger Macht <holger@homac.de>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
 drivers/ata/libata-acpi.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index adc6336..98826e96 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -987,7 +987,7 @@ static int ata_acpi_bind_host(struct device *dev, int host, acpi_handle *handle)
 	if (ap->flags & ATA_FLAG_ACPI_SATA)
 		return -ENODEV;
 
-	*handle = acpi_get_child(DEVICE_ACPI_HANDLE(dev->parent), ap->port_no);
+	*handle = acpi_get_child(DEVICE_ACPI_HANDLE(dev->parent->parent), ap->port_no);
 
 	if (!*handle)
 		return -ENODEV;
@@ -1021,13 +1021,13 @@ static int ata_acpi_find_device(struct device *dev, acpi_handle *handle)
 	unsigned int host, channel, id, lun;
 
 	if (sscanf(dev_name(dev), "host%u", &host) == 1) {
-		if (!compat_pci_ata(dev->parent))
+		if (!compat_pci_ata(dev->parent->parent))
 			return -ENODEV;
 
 		return ata_acpi_bind_host(dev, host, handle);
 	} else if (sscanf(dev_name(dev), "%d:%d:%d:%d",
 			&host, &channel, &id, &lun) == 4) {
-		if (!compat_pci_ata(dev->parent->parent->parent))
+		if (!compat_pci_ata(dev->parent->parent->parent->parent))
 			return -ENODEV;
 
 		return ata_acpi_bind_device(dev, channel, id, handle);
-- 
1.7.10

  parent reply	other threads:[~2012-06-18  6:25 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-18  6:25 [PATCH v5 0/13] SATA ZPODD support Lin Ming
2012-06-18  6:25 ` [PATCH v5 01/12] [SCSI]: add wrapper to access and set scsi_bus_type in struct acpi_bus_type Lin Ming
2012-06-18  6:25 ` [PATCH v5 02/12] libata: bind the Linux device tree to the ACPI device tree Lin Ming
2012-06-20 23:50   ` Dan Williams
2012-06-21  1:26     ` Lin Ming
2012-06-21  3:59       ` Dan Williams
2012-06-21  6:37         ` Lin Ming
2012-06-21 15:40           ` Dan Williams
2012-06-18  6:25 ` [PATCH v5 03/12] libata: migrate ACPI code over to new bindings Lin Ming
2012-06-18  6:25 ` Lin Ming [this message]
2012-06-18 11:37   ` [PATCH v5 04/12] libata: use correct PCI devices Sergei Shtylyov
2012-06-18 12:03     ` Lin Ming
2012-06-18  6:25 ` [PATCH v5 05/12] libata-acpi: set acpi state for SATA port Lin Ming
2012-06-18  6:26 ` [PATCH v5 06/12] libata-acpi: add ata port runtime D3Cold support Lin Ming
2012-06-18  6:26 ` [PATCH v5 07/12] libata-acpi: register/unregister device to/from power resource Lin Ming
2012-06-18  6:26 ` [PATCH v5 08/12] libata: detect Device Attention support Lin Ming
2012-06-18  6:26 ` [PATCH v5 09/12] libata: tell scsi layer device supports runtime power off Lin Ming
2012-06-18  6:26 ` [PATCH v5 10/12] [SCSI] sr: check support for device busy class events Lin Ming
2012-06-18  6:26 ` [PATCH v5 11/12] [SCSI] sr: support zero power ODD Lin Ming
2012-06-18  6:26 ` [PATCH v5 12/12] [SCSI] sr: make sure ODD is in resumed state in block ioctl Lin Ming
2012-06-18  6:32 ` [PATCH v5 00/12] SATA ZPODD support Lin Ming
2012-06-22 18:41 ` [PATCH v5 0/13] " Jeff Garzik
2012-06-23  1:05   ` Lin Ming

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=1340000766-129148-5-git-send-email-ming.m.lin@intel.com \
    --to=ming.m.lin@intel.com \
    --cc=David.Woodhouse@intel.com \
    --cc=aaron.lu@amd.com \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=holger@homac.de \
    --cc=jgarzik@pobox.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mjg@redhat.com \
    /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).