diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-11 23:23:02 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-11 23:23:02 +0100 |
| commit | 66f5854c6894dc028fc13345838c6f82bfcfef0c (patch) | |
| tree | 76ac271549bca0d1199df15e1087dcd0d3c6e911 /drivers/acpi/acpi_apd.c | |
| parent | Linux 4.9-rc4 (diff) | |
| parent | ACPI / platform: Add support for build-in properties (diff) | |
| download | linux-66f5854c6894dc028fc13345838c6f82bfcfef0c.tar.xz linux-66f5854c6894dc028fc13345838c6f82bfcfef0c.zip | |
Merge branch 'device-properties'
* device-properties:
ACPI / platform: Add support for build-in properties
Diffstat (limited to 'drivers/acpi/acpi_apd.c')
| -rw-r--r-- | drivers/acpi/acpi_apd.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c index d58fbf7f04e6..7dd70927991e 100644 --- a/drivers/acpi/acpi_apd.c +++ b/drivers/acpi/acpi_apd.c @@ -122,7 +122,7 @@ static int acpi_apd_create_device(struct acpi_device *adev, int ret; if (!dev_desc) { - pdev = acpi_create_platform_device(adev); + pdev = acpi_create_platform_device(adev, NULL); return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1; } @@ -139,14 +139,8 @@ static int acpi_apd_create_device(struct acpi_device *adev, goto err_out; } - if (dev_desc->properties) { - ret = device_add_properties(&adev->dev, dev_desc->properties); - if (ret) - goto err_out; - } - adev->driver_data = pdata; - pdev = acpi_create_platform_device(adev); + pdev = acpi_create_platform_device(adev, dev_desc->properties); if (!IS_ERR_OR_NULL(pdev)) return 1; |