Skip to content

Commit

Permalink
Revert "i2c: copy device properties when using i2c_register_board_inf…
Browse files Browse the repository at this point in the history
…o()"

This reverts commit b0c1e95. 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>
  • Loading branch information
Wolfram Sang committed Mar 9, 2017
1 parent e61dfc8 commit 806dbb2
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions drivers/i2c/i2c-boardinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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)
{
Expand All @@ -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);
}

Expand Down

0 comments on commit 806dbb2

Please sign in to comment.