All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lin Ming <ming.m.lin@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>,
	David Woodhouse <David.Woodhouse@intel.com>,
	Aaron Lu <aaron.lu@amd.com>, Holger Macht <holger@homac.de>,
	Matthew Garrett <mjg@redhat.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 v4 04/13] libata: use correct PCI devices
Date: Mon, 28 May 2012 13:08:31 +0800	[thread overview]
Message-ID: <1338181720-4149-5-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1338181720-4149-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 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 762e0c8..df4e21a 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -976,7 +976,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;
@@ -1010,13 +1010,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 (!is_pci_ata(dev->parent))
+		if (!is_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 (!is_pci_ata(dev->parent->parent->parent))
+		if (!is_pci_ata(dev->parent->parent->parent->parent))
 			return -ENODEV;
 
 		return ata_acpi_bind_device(dev, channel, id, handle);
-- 
1.7.2.5

  parent reply	other threads:[~2012-05-28  5:08 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-28  5:08 [PATCH v4 0/13] SATA ZPODD support Lin Ming
2012-05-28  5:08 ` [PATCH v4 01/13] [SCSI]: add wrapper to access and set scsi_bus_type in struct acpi_bus_type Lin Ming
2012-05-29 12:26   ` Sergei Shtylyov
2012-05-28  5:08 ` [PATCH v4 02/13] libata: bind the Linux device tree to the ACPI device tree Lin Ming
2012-05-28  9:51   ` Alan Cox
2012-06-13  8:03     ` Lin Ming
2012-06-13 11:00       ` Alan Cox
2012-06-13 11:00         ` Alan Cox
2012-06-14  7:43         ` Lin Ming
2012-05-28  5:08 ` [PATCH v4 03/13] libata: migrate ACPI code over to new bindings Lin Ming
2012-05-28  5:08 ` Lin Ming [this message]
2012-05-29 12:22   ` [PATCH v4 04/13] libata: use correct PCI devices Sergei Shtylyov
2012-05-28  5:08 ` [PATCH v4 05/13] libata-acpi: set acpi state for SATA port Lin Ming
2012-05-28  5:08 ` [PATCH v4 06/13] libata-acpi: add ata port runtime D3Cold support Lin Ming
2012-05-28  5:08 ` [PATCH v4 07/13] libata-acpi: register/unregister device to/from power resource Lin Ming
2012-05-28  5:08 ` [PATCH v4 08/13] libata: detect Device Attention support Lin Ming
2012-05-28  5:08 ` [PATCH v4 09/13] libata: tell scsi layer device supports runtime power off Lin Ming
2012-05-28  5:08 ` [PATCH v4 10/13] [SCSI] pm: resume device if suspend failed Lin Ming
2012-05-28  5:08 ` [PATCH v4 11/13] [SCSI] sr: check support for device busy class events Lin Ming
2012-05-28  5:08 ` [PATCH v4 12/13] [SCSI] sr: support zero power ODD Lin Ming
2012-05-28  5:08 ` [PATCH v4 13/13] [SCSI] sr: make sure ODD is in resumed state in block ioctl Lin Ming
2012-05-28  9:44 ` [PATCH v4 0/13] SATA ZPODD support Alan Cox
2012-05-28  9:54   ` Alan Cox
2012-05-29 12:32     ` Lin Ming
2012-05-30  5:43       ` Aaron Lu
2012-05-30  5:43         ` Aaron Lu
2012-05-30  9:06         ` Fuzhou Chen

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=1338181720-4149-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=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 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.