mtd: rawnand: docg4: Remove wrong __init annotations

geertu · Boris Brezillon · commit 166cd4421b0d · 2018-08-27T10:16:56.000+02:00
If gcc (e.g. 4.1.2) decides not to inline init_mtd_structs() and read_id_reg(), this will cause section mismatches, and crashes: WARNING: drivers/mtd/nand/raw/docg4.o(.text+0xc10): Section mismatch in reference from the function docg4_attach_chip() to the function .init.text:init_mtd_structs() The function docg4_attach_chip() references the function __init init_mtd_structs(). This is often because docg4_attach_chip lacks a __init annotation or the annotation of init_mtd_structs is wrong. WARNING: drivers/mtd/nand/raw/docg4.o(.text+0xc3e): Section mismatch in reference from the function docg4_attach_chip() to the function .init.text:read_id_reg() The function docg4_attach_chip() references the function __init read_id_reg(). This is often because docg4_attach_chip lacks a __init annotation or the annotation of read_id_reg is wrong. Fix this by dropping the now incorrect __init annotations from init_mtd_structs() and read_id_reg(). Fixes: 66a3847 ("mtd: rawnand: docg4: convert driver to nand_scan()") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
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);`