|
@@ -181,7 +181,6 @@ static bool acpi_pci_power_manageable(struct pci_dev *dev)
|
|
|
static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
|
|
|
{
|
|
|
acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
|
|
- acpi_handle tmp;
|
|
|
static const u8 state_conv[] = {
|
|
|
[PCI_D0] = ACPI_STATE_D0,
|
|
|
[PCI_D1] = ACPI_STATE_D1,
|
|
@@ -192,7 +191,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
|
|
|
int error = -EINVAL;
|
|
|
|
|
|
/* If the ACPI device has _EJ0, ignore the device */
|
|
|
- if (!handle || ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
|
|
|
+ if (!handle || acpi_has_method(handle, "_EJ0"))
|
|
|
return -ENODEV;
|
|
|
|
|
|
switch (state) {
|