Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9202036 authored by Aaron Lu's avatar Aaron Lu Committed by Tejun Heo
Browse files

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: default avatarAaron Lu <aaron.lu@intel.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent c75da205

drivers/ata/libata-zpodd.c

+2 −19
Original line number Diff line number Diff line
@@ -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);