Skip to content

Commit

Permalink
mtd: rawnand: docg4: Remove wrong __init annotations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Boris Brezillon committed Aug 27, 2018
1 parent 5b394b2 commit 166cd44
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/mtd/nand/raw/docg4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 166cd44

Please sign in to comment.