Merge branch 'imx/dt' into next/dt

1 files changed, 8 insertions, 16 deletions

diff --git a/arch/arm/plat-samsung/dev-i2c6.c b/arch/arm/plat-samsung/dev-i2c6.c
index 4083108908a8..141d799944e2 100644
--- a/arch/arm/plat-samsung/dev-i2c6.c
+++ b/arch/arm/plat-samsung/dev-i2c6.c
@@ -43,26 +43,18 @@ struct platform_device s3c_device_i2c6 = {
         .resource       = s3c_i2c_resource,
 };
 
-static struct s3c2410_platform_i2c default_i2c_data6 __initdata = {
-        .flags          = 0,
-        .bus_num        = 6,
-        .slave_addr     = 0x10,
-        .frequency      = 100*1000,
-        .sda_delay      = 100,
-};
-
 void __init s3c_i2c6_set_platdata(struct s3c2410_platform_i2c *pd)
 {
         struct s3c2410_platform_i2c *npd;
 
-        if (!pd)
-                pd = &default_i2c_data6;
+        if (!pd) {
+                pd = &default_i2c_data;
+                pd->bus_num = 6;
+        }
 
-        npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
-        if (!npd)
-                printk(KERN_ERR "%s: no memory for platform data\n", __func__);
-        else if (!npd->cfg_gpio)
-                npd->cfg_gpio = s3c_i2c6_cfg_gpio;
+        npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
+                               &s3c_device_i2c6);
 
-        s3c_device_i2c6.dev.platform_data = npd;
+        if (!npd->cfg_gpio)
+                npd->cfg_gpio = s3c_i2c6_cfg_gpio;
 }