diff options
| author |   Aaron Lu <aaron.lu@intel.com> | 2014-03-14 13:46:10 +0800 |
|---|---|---|
| committer |   Tejun Heo <tj@kernel.org> | 2014-03-14 11:23:47 -0400 |
| commit | d920203695029558ef16925182f89cf6302b50b0 (patch) | |
| tree | 660f8bb361fcf9d22d194f7c0fce7bf8f9ac90b5 /drivers/ata | |
| parent | libata: acpi: avoid passing NULL to ACPI evaluation method (diff) | |
| download | linux-dev-d920203695029558ef16925182f89cf6302b50b0.tar.xz linux-dev-d920203695029558ef16925182f89cf6302b50b0.zip | |
libata: zpodd: eliminate odd_can_poweroff
Now that we can directly get the ACPI device conterpart of the physical
ATA transport device, the odd_can_poweroff can be eliminated.
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-zpodd.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/ata/libata-zpodd.c b/drivers/ata/libata-zpodd.c index 88949c6d55dd..f3a65a3140d3 100644 --- a/drivers/ata/libata-zpodd.c +++ b/drivers/ata/libata-zpodd.c @@ -85,21 +85,6 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev) return ODD_MECH_TYPE_UNSUPPORTED; } -static bool odd_can_poweroff(struct ata_device *ata_dev) -{ - acpi_handle handle; - struct acpi_device *acpi_dev; - - handle = ata_dev_acpi_handle(ata_dev); - if (!handle) - return false; - - if (acpi_bus_get_device(handle, &acpi_dev)) - return false; - - return acpi_device_can_poweroff(acpi_dev); -} - /* Test if ODD is zero power ready by sense code */ static bool zpready(struct ata_device *dev) { @@ -267,13 +252,11 @@ static void ata_acpi_remove_pm_notifier(struct ata_device *dev) void zpodd_init(struct ata_device *dev) { + struct acpi_device *adev = ACPI_COMPANION(&dev->tdev); enum odd_mech_type mech_type; struct zpodd *zpodd; - if (dev->zpodd) - return; - - if (!odd_can_poweroff(dev)) + if (dev->zpodd || !adev || !acpi_device_can_poweroff(adev)) return; mech_type = zpodd_get_mech_type(dev); |