summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-scsi.c
diff options
context:
space:
mode:
authorAaron Lu <aaron.lu@intel.com>2013-10-17 15:38:53 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-17 15:38:53 +0200
commitb08fc109ce4a32ce2f73f6e0437abc94ab1dd023 (patch)
tree306d5ad934eeb86e60cbdf52c7dcdcac913dfab6 /drivers/ata/libata-scsi.c
parent41863fcee3039ec3de15003b78e7284c4393e862 (diff)
downloadlinux-stable-b08fc109ce4a32ce2f73f6e0437abc94ab1dd023.tar.gz
linux-stable-b08fc109ce4a32ce2f73f6e0437abc94ab1dd023.tar.bz2
linux-stable-b08fc109ce4a32ce2f73f6e0437abc94ab1dd023.zip
ATA / ACPI: remove power dependent device handling
Previously, we wanted SCSI devices corrsponding to ATA devices to be runtime resumed when the power resource for those ATA device was turned on by some other device, so we added the SCSI device to the dependent device list of the ATA device's ACPI node. However, this code has no effect after commit 41863fc (ACPI / power: Drop automaitc resume of power resource dependent devices) and the mechanism it was supposed to implement is regarded as a bad idea now, so drop it. [rjw: Changelog] Signed-off-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/ata/libata-scsi.c')
-rw-r--r--drivers/ata/libata-scsi.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 97a0cef12959..db6dfcfa3e2e 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3679,7 +3679,6 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
if (!IS_ERR(sdev)) {
dev->sdev = sdev;
scsi_device_put(sdev);
- ata_scsi_acpi_bind(dev);
} else {
dev->sdev = NULL;
}
@@ -3767,8 +3766,6 @@ static void ata_scsi_remove_dev(struct ata_device *dev)
struct scsi_device *sdev;
unsigned long flags;
- ata_scsi_acpi_unbind(dev);
-
/* Alas, we need to grab scan_mutex to ensure SCSI device
* state doesn't change underneath us and thus
* scsi_device_get() always succeeds. The mutex locking can