Merge branch 'for-4.7-dw' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[cascardo/linux.git] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index f437afa..6482d47 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -322,16 +322,16 @@ EXPORT_SYMBOL_GPL(platform_device_add_data);
 /**
  * platform_device_add_properties - add built-in properties to a platform device
  * @pdev: platform device to add properties to
- * @pset: properties to add
+ * @properties: null terminated array of properties to add
  *
- * The function will take deep copy of the properties in @pset and attach
- * the copy to the platform device. The memory associated with properties
- * will be freed when the platform device is released.
+ * The function will take deep copy of @properties and attach the copy to the
+ * platform device. The memory associated with properties will be freed when the
+ * platform device is released.
  */
 int platform_device_add_properties(struct platform_device *pdev,
-                                  const struct property_set *pset)
+                                  struct property_entry *properties)
 {
-       return device_add_property_set(&pdev->dev, pset);
+       return device_add_properties(&pdev->dev, properties);
 }
 EXPORT_SYMBOL_GPL(platform_device_add_properties);
 
@@ -447,7 +447,7 @@ void platform_device_del(struct platform_device *pdev)
                                release_resource(r);
                }
 
-               device_remove_property_set(&pdev->dev);
+               device_remove_properties(&pdev->dev);
        }
 }
 EXPORT_SYMBOL_GPL(platform_device_del);
@@ -526,8 +526,9 @@ struct platform_device *platform_device_register_full(
        if (ret)
                goto err;
 
-       if (pdevinfo->pset) {
-               ret = platform_device_add_properties(pdev, pdevinfo->pset);
+       if (pdevinfo->properties) {
+               ret = platform_device_add_properties(pdev,
+                                                    pdevinfo->properties);
                if (ret)
                        goto err;
        }