diff options
| author | Rafael J. Wysocki <[email protected]> | 2013-11-16 15:44:44 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2013-11-16 15:44:44 +0100 |
| commit | a7d2472d8145f6d0729317e3cabe2d0f1a14a87a (patch) | |
| tree | c15eceef4afd84dea49c8f40ae9b45349ce350a8 /drivers/base/platform.c | |
| parent | 2f466d33f5f60542d3d82c0477de5863b22c94b9 (diff) | |
| parent | 86b0cc12bba9cb9cc3c20974dec565f44c961fc3 (diff) | |
Merge branch 'acpi-driver-core'
* acpi-driver-core:
ACPI / AC: Remove struct acpi_device pointer from struct acpi_ac
spi: Use stable dev_name for ACPI enumerated SPI slaves
i2c: Use stable dev_name for ACPI enumerated I2C slaves
ACPI: Provide acpi_dev_name accessor for struct acpi_device device name
ACPI / bind: Use (put|get)_device() on ACPI device objects too
ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro
ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node
Diffstat (limited to 'drivers/base/platform.c')
| -rw-r--r-- | drivers/base/platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 47051cd25113..3a94b799f166 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -432,7 +432,7 @@ struct platform_device *platform_device_register_full( goto err_alloc; pdev->dev.parent = pdevinfo->parent; - ACPI_HANDLE_SET(&pdev->dev, pdevinfo->acpi_node.handle); + ACPI_COMPANION_SET(&pdev->dev, pdevinfo->acpi_node.companion); if (pdevinfo->dma_mask) { /* @@ -463,7 +463,7 @@ struct platform_device *platform_device_register_full( ret = platform_device_add(pdev); if (ret) { err: - ACPI_HANDLE_SET(&pdev->dev, NULL); + ACPI_COMPANION_SET(&pdev->dev, NULL); kfree(pdev->dev.dma_mask); err_alloc: |