summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpi_apd.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-11-11 23:23:02 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-11-11 23:23:02 +0100
commit66f5854c6894dc028fc13345838c6f82bfcfef0c (patch)
tree76ac271549bca0d1199df15e1087dcd0d3c6e911 /drivers/acpi/acpi_apd.c
parentbc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff)
parent1571875beecd5de9657f73931449bda1b1329b6f (diff)
downloadlinux-66f5854c6894dc028fc13345838c6f82bfcfef0c.tar.gz
linux-66f5854c6894dc028fc13345838c6f82bfcfef0c.tar.bz2
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.c10
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;