Skip to content

Commit

Permalink
ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
Browse files Browse the repository at this point in the history
Signed-off-by: Banajit Goswami <banajit.g@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Banajit Goswami authored and Kukjin Kim committed Jul 20, 2011
1 parent b19952a commit 17e86d3
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions arch/arm/plat-samsung/dev-nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -123,6 +122,4 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)
to++;
}
}

s3c_device_nand.dev.platform_data = npd;
}

0 comments on commit 17e86d3

Please sign in to comment.