diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 15:25:46 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 15:25:46 +0000 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/plat-samsung/dev-fb.c | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/arm/plat-samsung/dev-fb.c')
| -rw-r--r-- | arch/arm/plat-samsung/dev-fb.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/plat-samsung/dev-fb.c b/arch/arm/plat-samsung/dev-fb.c index bf60204c629..49a1362fd25 100644 --- a/arch/arm/plat-samsung/dev-fb.c +++ b/arch/arm/plat-samsung/dev-fb.c @@ -58,16 +58,6 @@ struct platform_device s3c_device_fb = { void __init s3c_fb_set_platdata(struct s3c_fb_platdata *pd) { - struct s3c_fb_platdata *npd; - - if (!pd) { - printk(KERN_ERR "%s: no platform data\n", __func__); - return; - } - - npd = kmemdup(pd, sizeof(struct s3c_fb_platdata), GFP_KERNEL); - if (!npd) - printk(KERN_ERR "%s: no memory for platform data\n", __func__); - - s3c_device_fb.dev.platform_data = npd; + s3c_set_platdata(pd, sizeof(struct s3c_fb_platdata), + &s3c_device_fb); } |