Skip to content

Commit

Permalink
ARM: omap: fix section mismatch errors in TWL PMIC driver
Browse files Browse the repository at this point in the history
WARNING: drivers/mfd/built-in.o(.devinit.text+0x258): Section mismatch in reference from the function twl_probe() to the function .init.text:twl4030_power_init()
The function __devinit twl_probe() references
a function __init twl4030_power_init().
If twl4030_power_init is only used by twl_probe then
annotate twl4030_power_init with a matching annotation.

twl4030_power_init() references other __init marked functions, so
these too must become __devinit.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Feb 13, 2012
1 parent 0bf68f5 commit a0bb10e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/mfd/twl4030-power.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static u8 res_config_addrs[] = {
[RES_MAIN_REF] = 0x94,
};

static int __init twl4030_write_script_byte(u8 address, u8 byte)
static int __devinit twl4030_write_script_byte(u8 address, u8 byte)
{
int err;

Expand All @@ -138,7 +138,7 @@ static int __init twl4030_write_script_byte(u8 address, u8 byte)
return err;
}

static int __init twl4030_write_script_ins(u8 address, u16 pmb_message,
static int __devinit twl4030_write_script_ins(u8 address, u16 pmb_message,
u8 delay, u8 next)
{
int err;
Expand All @@ -158,7 +158,7 @@ static int __init twl4030_write_script_ins(u8 address, u16 pmb_message,
return err;
}

static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,
static int __devinit twl4030_write_script(u8 address, struct twl4030_ins *script,
int len)
{
int err;
Expand All @@ -183,7 +183,7 @@ static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,
return err;
}

static int __init twl4030_config_wakeup3_sequence(u8 address)
static int __devinit twl4030_config_wakeup3_sequence(u8 address)
{
int err;
u8 data;
Expand All @@ -208,7 +208,7 @@ static int __init twl4030_config_wakeup3_sequence(u8 address)
return err;
}

static int __init twl4030_config_wakeup12_sequence(u8 address)
static int __devinit twl4030_config_wakeup12_sequence(u8 address)
{
int err = 0;
u8 data;
Expand Down Expand Up @@ -262,7 +262,7 @@ static int __init twl4030_config_wakeup12_sequence(u8 address)
return err;
}

static int __init twl4030_config_sleep_sequence(u8 address)
static int __devinit twl4030_config_sleep_sequence(u8 address)
{
int err;

Expand All @@ -276,7 +276,7 @@ static int __init twl4030_config_sleep_sequence(u8 address)
return err;
}

static int __init twl4030_config_warmreset_sequence(u8 address)
static int __devinit twl4030_config_warmreset_sequence(u8 address)
{
int err;
u8 rd_data;
Expand Down Expand Up @@ -324,7 +324,7 @@ static int __init twl4030_config_warmreset_sequence(u8 address)
return err;
}

static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
static int __devinit twl4030_configure_resource(struct twl4030_resconfig *rconfig)
{
int rconfig_addr;
int err;
Expand Down Expand Up @@ -416,7 +416,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
return 0;
}

static int __init load_twl4030_script(struct twl4030_script *tscript,
static int __devinit load_twl4030_script(struct twl4030_script *tscript,
u8 address)
{
int err;
Expand Down Expand Up @@ -527,7 +527,7 @@ void twl4030_power_off(void)
pr_err("TWL4030 Unable to power off\n");
}

void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
void __devinit twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
{
int err = 0;
int i;
Expand Down

0 comments on commit a0bb10e

Please sign in to comment.