leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ACPI] gut acpi_pci_choose_state() to avoid conflict

Browse Source 
with pending pm_message_t re-definition.

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2005-03-23 16:16:03 -05:00
parent fa9cd547e0
commit a406d9e63e
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/pci/pci-acpi.c
View File

@ -1,6 +1,6 @@
/*
* File: pci-acpi.c
* Purpose: Provde PCI support in ACPI
* Purpose: Provide PCI support in ACPI
*
* Copyright (C) 2005 David Shaohua Li <shaohua.li@intel.com>
* Copyright (C) 2004 Tom Long Nguyen <tom.l.nguyen@intel.com>
@ -237,19 +237,8 @@ EXPORT_SYMBOL(pci_osc_control_set);
static int acpi_pci_choose_state(struct pci_dev *pdev, pm_message_t state)
{
char dstate_str[] = "_S0D";
acpi_status status;
unsigned long val;
struct device *dev = &pdev->dev;
/* TBD */
/* Fixme: the check is wrong after pm_message_t is a struct */
if ((state >= PM_SUSPEND_MAX) || !DEVICE_ACPI_HANDLE(dev))
return -EINVAL;
dstate_str[2] += state; /* _S1D, _S2D, _S3D, _S4D */
status = acpi_evaluate_integer(DEVICE_ACPI_HANDLE(dev), dstate_str,
NULL, &val);
if (ACPI_SUCCESS(status))
return val;
return -ENODEV;
}