mtd: rawnand: docg4: Remove wrong __init annotations
diff mbox series

Message ID 20180823214345.20949-1-geert@linux-m68k.org
State New, archived
Headers show
Series
  • mtd: rawnand: docg4: Remove wrong __init annotations
Related show

Commit Message

Geert Uytterhoeven Aug. 23, 2018, 9:43 p.m. UTC
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: 66a38478dcc5b5a3 ("mtd: rawnand: docg4: convert driver to nand_scan()")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/mtd/nand/raw/docg4.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Boris Brezillon Aug. 27, 2018, 6:44 p.m. UTC | #1
On Thu, 23 Aug 2018 23:43:45 +0200
Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> 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: 66a38478dcc5b5a3 ("mtd: rawnand: docg4: convert driver to nand_scan()")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Queued to mtd/master.

Thanks,

Boris

> ---
>  drivers/mtd/nand/raw/docg4.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/docg4.c b/drivers/mtd/nand/raw/docg4.c
> index a3f04315c05c54e6..427fcbc1b71c0551 100644
> --- 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);

Patch
diff mbox series

diff --git a/drivers/mtd/nand/raw/docg4.c b/drivers/mtd/nand/raw/docg4.c
index a3f04315c05c54e6..427fcbc1b71c0551 100644
--- 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);