diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/plat-samsung/dev-hwmon.c | |
parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/arm/plat-samsung/dev-hwmon.c')
-rw-r--r-- | arch/arm/plat-samsung/dev-hwmon.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/plat-samsung/dev-hwmon.c b/arch/arm/plat-samsung/dev-hwmon.c index b3ffb958725..c91a79ce8f3 100644 --- a/arch/arm/plat-samsung/dev-hwmon.c +++ b/arch/arm/plat-samsung/dev-hwmon.c | |||
@@ -27,16 +27,6 @@ struct platform_device s3c_device_hwmon = { | |||
27 | 27 | ||
28 | void __init s3c_hwmon_set_platdata(struct s3c_hwmon_pdata *pd) | 28 | void __init s3c_hwmon_set_platdata(struct s3c_hwmon_pdata *pd) |
29 | { | 29 | { |
30 | struct s3c_hwmon_pdata *npd; | 30 | s3c_set_platdata(pd, sizeof(struct s3c_hwmon_pdata), |
31 | 31 | &s3c_device_hwmon); | |
32 | if (!pd) { | ||
33 | printk(KERN_ERR "%s: no platform data\n", __func__); | ||
34 | return; | ||
35 | } | ||
36 | |||
37 | npd = kmemdup(pd, sizeof(struct s3c_hwmon_pdata), GFP_KERNEL); | ||
38 | if (!npd) | ||
39 | printk(KERN_ERR "%s: no memory for platform data\n", __func__); | ||
40 | |||
41 | s3c_device_hwmon.dev.platform_data = npd; | ||
42 | } | 32 | } |