2011-04-18 14:11:42

by Haojian Zhuang

Subject: [PATCH 07/14] mfd: fix build warning on 88pm860x

WARNING: vmlinux.o(.devinit.text+0x6c4): Section mismatch in reference
from the function device_onkey_init() to the (unknown reference)
.init.data:(unknown)
The function __devinit device_onkey_init() references a (unknown reference)
__initdata (unknown).
If (unknown) is only used by device_onkey_init then annotate (unknown)
with a matching annotation.

It's caused by using __initdata on mfd cell resources. Replace __initdata
with __devinitdata.

Signed-off-by: Haojian Zhuang <[email protected]>
---
drivers/mfd/88pm860x-core.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index f114ec7..4fbc69b 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -21,13 +21,13 @@

#define INT_STATUS_NUM 3

-static struct resource bk_resources[] __initdata = {
+static struct resource bk_resources[] __devinitdata = {
{PM8606_BACKLIGHT1, PM8606_BACKLIGHT1, "backlight-0", IORESOURCE_IO,},
{PM8606_BACKLIGHT2, PM8606_BACKLIGHT2, "backlight-1", IORESOURCE_IO,},
{PM8606_BACKLIGHT3, PM8606_BACKLIGHT3, "backlight-2", IORESOURCE_IO,},
};

-static struct resource led_resources[] __initdata = {
+static struct resource led_resources[] __devinitdata = {
{PM8606_LED1_RED, PM8606_LED1_RED, "led0-red", IORESOURCE_IO,},
{PM8606_LED1_GREEN, PM8606_LED1_GREEN, "led0-green", IORESOURCE_IO,},
{PM8606_LED1_BLUE, PM8606_LED1_BLUE, "led0-blue", IORESOURCE_IO,},
@@ -36,7 +36,7 @@ static struct resource led_resources[] __initdata = {
{PM8606_LED2_BLUE, PM8606_LED2_BLUE, "led1-blue", IORESOURCE_IO,},
};

-static struct resource regulator_resources[] __initdata = {
+static struct resource regulator_resources[] __devinitdata = {
{PM8607_ID_BUCK1, PM8607_ID_BUCK1, "buck-1", IORESOURCE_IO,},
{PM8607_ID_BUCK2, PM8607_ID_BUCK2, "buck-2", IORESOURCE_IO,},
{PM8607_ID_BUCK3, PM8607_ID_BUCK3, "buck-3", IORESOURCE_IO,},
@@ -61,15 +61,15 @@ static struct resource rtc_resources[] __devinitdata = {
{PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},
};

-static struct resource touch_resources[] __initdata = {
+static struct resource touch_resources[] __devinitdata = {
{PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,},
};

-static struct resource onkey_resources[] __initdata = {
+static struct resource onkey_resources[] __devinitdata = {
{PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,},
};

-static struct resource codec_resources[] __initdata = {
+static struct resource codec_resources[] __devinitdata = {
/* Headset microphone insertion or removal */
{PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,},
/* Hook-switch press or release */
@@ -80,12 +80,12 @@ static struct resource codec_resources[] __initdata = {
{PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,},
};

-static struct resource battery_resources[] __initdata = {
+static struct resource battery_resources[] __devinitdata = {
{PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,},
{PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,},
};

-static struct resource charger_resources[] __initdata = {
+static struct resource charger_resources[] __devinitdata = {
{PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,},
{PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,},
{PM8607_IRQ_CHG_FAULT, PM8607_IRQ_CHG_FAULT, "charging timeout", IORESOURCE_IRQ,},
@@ -94,13 +94,13 @@ static struct resource charger_resources[] __initdata = {
{PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,},
};

-static struct mfd_cell bk_devs[] __initdata = {
+static struct mfd_cell bk_devs[] = {
{"88pm860x-backlight", 0,},
{"88pm860x-backlight", 1,},
{"88pm860x-backlight", 2,},
};

-static struct mfd_cell led_devs[] __initdata = {
+static struct mfd_cell led_devs[] = {
{"88pm860x-led", 0,},
{"88pm860x-led", 1,},
{"88pm860x-led", 2,},
@@ -109,7 +109,7 @@ static struct mfd_cell led_devs[] __initdata = {
{"88pm860x-led", 5,},
};

-static struct mfd_cell regulator_devs[] __initdata = {
+static struct mfd_cell regulator_devs[] = {
{"88pm860x-regulator", 0,},
{"88pm860x-regulator", 1,},
{"88pm860x-regulator", 2,},
@@ -134,15 +134,15 @@ static struct mfd_cell rtc_devs[] = {
{"88pm860x-rtc", -1,},
};

-static struct mfd_cell touch_devs[] __initdata = {
+static struct mfd_cell touch_devs[] = {
{"88pm860x-touch", -1,},
};

-static struct mfd_cell onkey_devs[] __initdata = {
+static struct mfd_cell onkey_devs[] = {
{"88pm860x-onkey", -1,},
};

-static struct mfd_cell codec_devs[] __initdata = {
+static struct mfd_cell codec_devs[] = {
{"88pm860x-codec", -1,},
};

--
1.5.6.5

2011-04-26 09:49:24

by Samuel Ortiz

Subject: Re: [PATCH 07/14] mfd: fix build warning on 88pm860x

Hi Haojian,

On Mon, Apr 18, 2011 at 10:04:04PM +0800, Haojian Zhuang wrote:
> WARNING: vmlinux.o(.devinit.text+0x6c4): Section mismatch in reference
> from the function device_onkey_init() to the (unknown reference)
> .init.data:(unknown)
> The function __devinit device_onkey_init() references a (unknown reference)
> __initdata (unknown).
> If (unknown) is only used by device_onkey_init then annotate (unknown)
> with a matching annotation.
>
> It's caused by using __initdata on mfd cell resources. Replace __initdata
> with __devinitdata.
Patch applied, many thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/

2011-04-26 16:44:26

by Haojian Zhuang

Subject: Re: [PATCH 07/14] mfd: fix build warning on 88pm860x

On Tue, Apr 26, 2011 at 5:49 PM, Samuel Ortiz <[email protected]> wrote:
> Hi Haojian,
>
> On Mon, Apr 18, 2011 at 10:04:04PM +0800, Haojian Zhuang wrote:
>> WARNING: vmlinux.o(.devinit.text+0x6c4): Section mismatch in reference
>> from the function device_onkey_init() to the (unknown reference)
>> .init.data:(unknown)
>> The function __devinit device_onkey_init() references a (unknown reference)
>> ?__initdata (unknown).
>> If (unknown) is only used by device_onkey_init then annotate (unknown)
>> with a matching annotation.
>>
>> It's caused by using __initdata on mfd cell resources. Replace __initdata
>> with __devinitdata.
> Patch applied, many thanks.
>
Thanks a lot. But I can't find it in your mfd tree. Could you update
your tree? Since
I need to rebase it and format new patches.

Best Regards
Haojian

2011-04-26 16:47:28

by Samuel Ortiz

Subject: Re: [PATCH 07/14] mfd: fix build warning on 88pm860x

Hi Haojian,

On Wed, Apr 27, 2011 at 12:44:23AM +0800, Haojian Zhuang wrote:
> On Tue, Apr 26, 2011 at 5:49 PM, Samuel Ortiz <[email protected]> wrote:
> > Hi Haojian,
> >
> > On Mon, Apr 18, 2011 at 10:04:04PM +0800, Haojian Zhuang wrote:
> >> WARNING: vmlinux.o(.devinit.text+0x6c4): Section mismatch in reference
> >> from the function device_onkey_init() to the (unknown reference)
> >> .init.data:(unknown)
> >> The function __devinit device_onkey_init() references a (unknown reference)
> >> ?__initdata (unknown).
> >> If (unknown) is only used by device_onkey_init then annotate (unknown)
> >> with a matching annotation.
> >>
> >> It's caused by using __initdata on mfd cell resources. Replace __initdata
> >> with __devinitdata.
> > Patch applied, many thanks.
> >
> Thanks a lot. But I can't find it in your mfd tree. Could you update
> your tree? Since
> I need to rebase it and format new patches.
I just pushed to kernel.org. It's going to be there soon.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/