mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro
Since DEVICE_ACPI_HANDLE() is now literally identical to ACPI_HANDLE(), replace it with the latter everywhere and drop its definition from include/acpi.h. Signed-off-by: Rafael J. Wysocki <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
7b1998116b
commit
3a83f99249
21 changed files with 42 additions and 44 deletions
|
|
@ -89,7 +89,7 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
|
|||
|
||||
pnp_dbg(&dev->dev, "set resources\n");
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
|
||||
return -ENODEV;
|
||||
|
|
@ -122,7 +122,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
|
|||
|
||||
dev_dbg(&dev->dev, "disable resources\n");
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
|
||||
return 0;
|
||||
|
|
@ -144,7 +144,7 @@ static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
|
|||
struct acpi_device *acpi_dev;
|
||||
acpi_handle handle;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
|
||||
return false;
|
||||
|
|
@ -159,7 +159,7 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
|
|||
acpi_handle handle;
|
||||
int error = 0;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
|
||||
return 0;
|
||||
|
|
@ -194,7 +194,7 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
|
|||
static int pnpacpi_resume(struct pnp_dev *dev)
|
||||
{
|
||||
struct acpi_device *acpi_dev;
|
||||
acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
acpi_handle handle = ACPI_HANDLE(&dev->dev);
|
||||
int error = 0;
|
||||
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue