summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung
diff options
context:
space:
mode:
authorBanajit Goswami <banajit.g@samsung.com>2011-07-20 18:11:48 +0200
committerKukjin Kim <kgene.kim@samsung.com>2011-07-20 19:11:16 +0200
commit17e86d3879d589fce4c457bfb9a2029f883fb2cb (patch)
tree498788bc1bb1af0f3640a423c7f228c7da9f56d0 /arch/arm/plat-samsung
parentARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI (diff)
downloadlinux-17e86d3879d589fce4c457bfb9a2029f883fb2cb.tar.xz
linux-17e86d3879d589fce4c457bfb9a2029f883fb2cb.zip
ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r--arch/arm/plat-samsung/dev-nand.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/plat-samsung/dev-nand.c b/arch/arm/plat-samsung/dev-nand.c
index 6927ae8fd118..b8e30ec6ac26 100644
--- a/arch/arm/plat-samsung/dev-nand.c
+++ b/arch/arm/plat-samsung/dev-nand.c
@@ -91,11 +91,10 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)
* time then there is little chance the system is going to run.
*/
- npd = kmemdup(nand, sizeof(struct s3c2410_platform_nand), GFP_KERNEL);
- if (!npd) {
- printk(KERN_ERR "%s: failed copying platform data\n", __func__);
+ npd = s3c_set_platdata(nand, sizeof(struct s3c2410_platform_nand),
+ &s3c_device_nand);
+ if (!npd)
return;
- }
/* now see if we need to copy any of the nand set data */
@@ -123,6 +122,4 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)
to++;
}
}
-
- s3c_device_nand.dev.platform_data = npd;
}