Commit 806dbb20 authored by Wolfram Sang's avatar Wolfram Sang

Revert "i2c: copy device properties when using i2c_register_board_info()"

This reverts commit b0c1e95a. 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: default avatarWolfram Sang <wsa@the-dreams.de>
parent e61dfc83
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/property.h>
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -56,7 +55,6 @@ EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num); ...@@ -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 * 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. * 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) 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 ...@@ -80,14 +78,6 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig
devinfo->busnum = busnum; devinfo->busnum = busnum;
devinfo->board_info = *info; 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); list_add_tail(&devinfo->list, &__i2c_board_list);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment