[PATCH 2/2] driver core: platform: Remove platform_device_add_properties()

From: Heikki Krogerus
Date: Tue May 18 2021 - 04:30:48 EST


There are no more users for it. The last place where it's
called is in platform_device_register_full(). Replacing that
call with device_create_managed_software_node() and
removing the function.

Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
---
drivers/base/platform.c | 20 ++------------------
include/linux/platform_device.h | 2 --
2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 9cd34def2237b..0299b03e64d40 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -661,22 +661,6 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
}
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
- * @properties: null terminated array of properties to add
- *
- * 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_entry *properties)
-{
- return device_add_properties(&pdev->dev, properties);
-}
-EXPORT_SYMBOL_GPL(platform_device_add_properties);
-
/**
* platform_device_add - add a platform device to device hierarchy
* @pdev: platform device we're adding
@@ -862,8 +846,8 @@ struct platform_device *platform_device_register_full(
goto err;

if (pdevinfo->properties) {
- ret = platform_device_add_properties(pdev,
- pdevinfo->properties);
+ ret = device_create_managed_software_node(&pdev->dev,
+ pdevinfo->properties, NULL);
if (ret)
goto err;
}
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index cd81e060863c9..a05eb819f306a 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -200,8 +200,6 @@ extern int platform_device_add_resources(struct platform_device *pdev,
unsigned int num);
extern int platform_device_add_data(struct platform_device *pdev,
const void *data, size_t size);
-extern int platform_device_add_properties(struct platform_device *pdev,
- const struct property_entry *properties);
extern int platform_device_add(struct platform_device *pdev);
extern void platform_device_del(struct platform_device *pdev);
extern void platform_device_put(struct platform_device *pdev);
--
2.30.2