summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/dev-i2c7.c
diff options
context:
space:
mode:
authorNaveen Krishna Chatradhi <ch.naveen@samsung.com>2011-07-16 06:26:14 +0200
committerKukjin Kim <kgene.kim@samsung.com>2011-07-20 19:09:54 +0200
commit2c2e2c27e621e75313a6d0574afc0eedae3da84e (patch)
treeebe456fca978cb1a0cd320069ab1a14ba8b3f090 /arch/arm/plat-samsung/dev-i2c7.c
parentMerge branch 'next-samsung-clkdev-fix' into next-samsung-cleanup (diff)
downloadlinux-2c2e2c27e621e75313a6d0574afc0eedae3da84e.tar.xz
linux-2c2e2c27e621e75313a6d0574afc0eedae3da84e.zip
ARM: SAMSUNG: Use generic set_plat_data function
Calls the generic s3c_set_platdata function instead. Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung/dev-i2c7.c')
-rw-r--r--arch/arm/plat-samsung/dev-i2c7.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/plat-samsung/dev-i2c7.c b/arch/arm/plat-samsung/dev-i2c7.c
index 1182451d7dce..70b249ac08cb 100644
--- a/arch/arm/plat-samsung/dev-i2c7.c
+++ b/arch/arm/plat-samsung/dev-i2c7.c
@@ -58,11 +58,9 @@ void __init s3c_i2c7_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data7;
- 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_i2c7_cfg_gpio;
+ npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
+ &s3c_device_i2c7);
- s3c_device_i2c7.dev.platform_data = npd;
+ if (!npd->cfg_gpio)
+ npd->cfg_gpio = s3c_i2c7_cfg_gpio;
}