Merge tag 'mtd/for-4.19-rc2' of git://git.infradead.org/linux-mtd

torvalds · torvalds · commit 9f8f16c86e4d · 2018-08-30T10:05:12.000-07:00
Pull mtd fixes from Boris Brezillon:
 "Raw NAND fixes:

   - denali: Fix a regression caused by the nand_scan() rework

   - docg4: Fix a build error when gcc decides to not iniline some
     functions (can be reproduced with gcc 4.1.2):

* tag 'mtd/for-4.19-rc2' of git://git.infradead.org/linux-mtd:
  mtd: rawnand: denali: do not pass zero maxchips to nand_scan()
  mtd: rawnand: docg4: Remove wrong __init annotations
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
@@ -1338,6 +1338,11 @@ int denali_init(struct denali_nand_info *denali)
 
 	denali_enable_irq(denali);
 	denali_reset_banks(denali);
+	if (!denali->max_banks) {
+		/* Error out earlier if no chip is found for some reasons. */
+		ret = -ENODEV;
+		goto disable_irq;
+	}
 
 	denali->active_bank = DENALI_INVALID_BANK;
 
diff --git a/drivers/mtd/nand/raw/docg4.c b/drivers/mtd/nand/raw/docg4.c
@@ -1218,7 +1218,7 @@ static int docg4_resume(struct platform_device *pdev)
 	return 0;
 }
 
-static void __init init_mtd_structs(struct mtd_info *mtd)
+static void init_mtd_structs(struct mtd_info *mtd)
 {
 	/* initialize mtd and nand data structures */
 
@@ -1290,7 +1290,7 @@ static void __init init_mtd_structs(struct mtd_info *mtd)
 
 }
 
-static int __init read_id_reg(struct mtd_info *mtd)
+static int read_id_reg(struct mtd_info *mtd)
 {
 	struct nand_chip *nand = mtd_to_nand(mtd);
 	struct docg4_priv *doc = nand_get_controller_data(nand);

Original file line number	Diff line number	Diff line change
`@@ -1218,7 +1218,7 @@ static int docg4_resume(struct platform_device *pdev)`
`1218`	`1218`	`return 0;`
`1219`	`1219`	`}`
`1220`	`1220`
`1221`		`-static void __init init_mtd_structs(struct mtd_info *mtd)`
	`1221`	`+static void init_mtd_structs(struct mtd_info *mtd)`
`1222`	`1222`	`{`
`1223`	`1223`	`/* initialize mtd and nand data structures */`
`1224`	`1224`
`@@ -1290,7 +1290,7 @@ static void __init init_mtd_structs(struct mtd_info *mtd)`
`1290`	`1290`
`1291`	`1291`	`}`
`1292`	`1292`
`1293`		`-static int __init read_id_reg(struct mtd_info *mtd)`
	`1293`	`+static int read_id_reg(struct mtd_info *mtd)`
`1294`	`1294`	`{`
`1295`	`1295`	`struct nand_chip *nand = mtd_to_nand(mtd);`
`1296`	`1296`	`struct docg4_priv *doc = nand_get_controller_data(nand);`