From: Banajit Goswami Date: Wed, 20 Jul 2011 16:11:48 +0000 (+0900) Subject: ARM: SAMSUNG: Use generic s3c_set_platdata for NAND X-Git-Tag: v3.1-rc1~248^2^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17e86d3879d589fce4c457bfb9a2029f883fb2cb;p=profile%2Fivi%2Fkernel-x86-ivi.git ARM: SAMSUNG: Use generic s3c_set_platdata for NAND Signed-off-by: Banajit Goswami Signed-off-by: Kukjin Kim --- diff --git a/arch/arm/plat-samsung/dev-nand.c b/arch/arm/plat-samsung/dev-nand.c index 6927ae8..b8e30ec 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; }