aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
15#include <linux/export.h> 15#include <linux/export.h>
16#include <linux/i2c.h> 16#include <linux/i2c.h>
17#include <linux/kernel.h> 17#include <linux/kernel.h>
18#include <linux/property.h>
19#include <linux/rwsem.h> 18#include <linux/rwsem.h>
20#include <linux/slab.h> 19#include <linux/slab.h>
21 20
@@ -56,7 +55,6 @@ EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num);
56 * 55 *
57 * The board info passed can safely be __initdata, but be careful of embedded 56 * The board info passed can safely be __initdata, but be careful of embedded
58 * pointers (for platform_data, functions, etc) since that won't be copied. 57 * pointers (for platform_data, functions, etc) since that won't be copied.
59 * Device properties are deep-copied though.
60 */ 58 */
61int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len) 59int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len)
62{ 60{
@@ -80,14 +78,6 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig
80 78
81 devinfo->busnum = busnum; 79 devinfo->busnum = busnum;
82 devinfo->board_info = *info; 80 devinfo->board_info = *info;
83
84 if (info->properties) {
85 devinfo->board_info.properties =
86 property_entries_dup(info->properties);
87 if (IS_ERR(devinfo->board_info.properties))
88 return PTR_ERR(devinfo->board_info.properties);
89 }
90
91 list_add_tail(&devinfo->list, &__i2c_board_list); 81 list_add_tail(&devinfo->list, &__i2c_board_list);
92 } 82 }
93 83