summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2017-03-09 18:41:48 +0300
committerWolfram Sang <wsa@the-dreams.de>2017-03-09 18:41:48 +0300
commit806dbb20efde821910b5f747befed794077a9109 (patch)
treea1ccf4f8c95ef21f58ee42fc5847b31be4fea3af /drivers
parente61dfc836b8a95c54e5b41d2247df258b0593a1b (diff)
downloadlinux-806dbb20efde821910b5f747befed794077a9109.tar.xz
Revert "i2c: copy device properties when using i2c_register_board_info()"
This reverts commit b0c1e95ab44feaad8831f2c06a3473c974003b49. It contains a flaw and the next version has more features added which makes me want to move it to the next cycle. Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/i2c-boardinfo.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c
index 5b8f6c3a6950..6e5fac6a5262 100644
--- a/drivers/i2c/i2c-boardinfo.c
+++ b/drivers/i2c/i2c-boardinfo.c
@@ -15,7 +15,6 @@
#include <linux/export.h>
#include <linux/i2c.h>
#include <linux/kernel.h>
-#include <linux/property.h>
#include <linux/rwsem.h>
#include <linux/slab.h>
@@ -56,7 +55,6 @@ EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num);
*
* The board info passed can safely be __initdata, but be careful of embedded
* pointers (for platform_data, functions, etc) since that won't be copied.
- * Device properties are deep-copied though.
*/
int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len)
{
@@ -80,14 +78,6 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig
devinfo->busnum = busnum;
devinfo->board_info = *info;
-
- if (info->properties) {
- devinfo->board_info.properties =
- property_entries_dup(info->properties);
- if (IS_ERR(devinfo->board_info.properties))
- return PTR_ERR(devinfo->board_info.properties);
- }
-
list_add_tail(&devinfo->list, &__i2c_board_list);
}