Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
mtd
/
nand
/
s3c2410.c
diff --git
a/kernel/drivers/mtd/nand/s3c2410.c
b/kernel/drivers/mtd/nand/s3c2410.c
index
0e02be4
..
05105ca
100644
(file)
--- a/
kernel/drivers/mtd/nand/s3c2410.c
+++ b/
kernel/drivers/mtd/nand/s3c2410.c
@@
-832,7
+832,6
@@
static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
nmtd->info = info;
nmtd->mtd.priv = chip;
nmtd->info = info;
nmtd->mtd.priv = chip;
- nmtd->mtd.owner = THIS_MODULE;
nmtd->set = set;
#ifdef CONFIG_MTD_NAND_S3C2410_HWECC
nmtd->set = set;
#ifdef CONFIG_MTD_NAND_S3C2410_HWECC
@@
-1016,6
+1015,7
@@
static int s3c24xx_nand_probe(struct platform_device *pdev)
pr_debug("initialising set %d (%p, info %p)\n",
setno, nmtd, info);
pr_debug("initialising set %d (%p, info %p)\n",
setno, nmtd, info);
+ nmtd->mtd.dev.parent = &pdev->dev;
s3c2410_nand_init_chip(info, nmtd, sets);
nmtd->scan_res = nand_scan_ident(&nmtd->mtd,
s3c2410_nand_init_chip(info, nmtd, sets);
nmtd->scan_res = nand_scan_ident(&nmtd->mtd,
@@
-1105,7
+1105,7
@@
static int s3c24xx_nand_resume(struct platform_device *dev)
/* driver device registration */
/* driver device registration */
-static struct platform_device_id s3c24xx_driver_ids[] = {
+static
const
struct platform_device_id s3c24xx_driver_ids[] = {
{
.name = "s3c2410-nand",
.driver_data = TYPE_S3C2410,
{
.name = "s3c2410-nand",
.driver_data = TYPE_S3C2410,