[PATCH] mfd/tc6393xb: don't use devinit data from non-init function

Uwe Kleine-König

unread,

Mar 2, 2010, 11:30:02 AM3/2/10

to

tc6393xb_mmc_resources (which was marked __devinitdata) is used in
tc6393xb_mmc_enable() and tc6393xb_mmc_resume() which both are functions
living in .text. This is not save with CONFIG_HOTPLUG=n.

This was introduced in

64e8867 (mfd: tmio_mmc hardware abstraction for CNF area)

Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Ian Molton <i...@mnementh.co.uk>
Cc: Magnus Damm <da...@opensource.se>
Cc: Samuel Ortiz <sa...@linux.intel.com>
---
drivers/mfd/tc6393xb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 4bc5a08..b057d8d 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -154,7 +154,7 @@ static struct resource __devinitdata tc6393xb_nand_resources[] = {
},
};

-static struct resource __devinitdata tc6393xb_mmc_resources[] = {
+static struct resource tc6393xb_mmc_resources[] = {
{
.start = 0x800,
.end = 0x9ff,
--
1.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Uwe Kleine-König

unread,

Oct 19, 2010, 3:30:01 AM10/19/10

to

Hello,

On Tue, Mar 02, 2010 at 05:22:33PM +0100, Uwe Kleine-K�nig wrote:
> tc6393xb_mmc_resources (which was marked __devinitdata) is used in
> tc6393xb_mmc_enable() and tc6393xb_mmc_resume() which both are functions
> living in .text. This is not save with CONFIG_HOTPLUG=n.
>
> This was introduced in
>
> 64e8867 (mfd: tmio_mmc hardware abstraction for CNF area)
>

> Signed-off-by: Uwe Kleine-K�nig <u.klein...@pengutronix.de>

> Cc: Ian Molton <i...@mnementh.co.uk>
> Cc: Magnus Damm <da...@opensource.se>
> Cc: Samuel Ortiz <sa...@linux.intel.com>

ping

Uwe

> ---
> drivers/mfd/tc6393xb.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
> index 4bc5a08..b057d8d 100644
> --- a/drivers/mfd/tc6393xb.c
> +++ b/drivers/mfd/tc6393xb.c
> @@ -154,7 +154,7 @@ static struct resource __devinitdata tc6393xb_nand_resources[] = {
> },
> };
>
> -static struct resource __devinitdata tc6393xb_mmc_resources[] = {
> +static struct resource tc6393xb_mmc_resources[] = {
> {
> .start = 0x800,
> .end = 0x9ff,
> --
> 1.7.0
>
>

--
Pengutronix e.K. | Uwe Kleine-K�nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |

Ian Molton

unread,

Oct 19, 2010, 3:50:02 AM10/19/10

to

I already acked it... wonder where it went?

Acked-by: Ian Molton <i...@mnementh.co.uk>

:)

--
Ian Molton
Linux, Automotive, and other hacking:
http://www.mnementh.co.uk/

2010/10/19 Uwe Kleine-K�nig <u.klein...@pengutronix.de>:

Samuel Ortiz

unread,

Oct 19, 2010, 6:40:02 AM10/19/10

to

Hi Uwe,

On Tue, Oct 19, 2010 at 09:19:51AM +0200, Uwe Kleine-K�nig wrote:
> Hello,
>
> On Tue, Mar 02, 2010 at 05:22:33PM +0100, Uwe Kleine-K�nig wrote:
> > tc6393xb_mmc_resources (which was marked __devinitdata) is used in
> > tc6393xb_mmc_enable() and tc6393xb_mmc_resume() which both are functions
> > living in .text. This is not save with CONFIG_HOTPLUG=n.
> >
> > This was introduced in
> >
> > 64e8867 (mfd: tmio_mmc hardware abstraction for CNF area)
> >
> > Signed-off-by: Uwe Kleine-K�nig <u.klein...@pengutronix.de>
> > Cc: Ian Molton <i...@mnementh.co.uk>
> > Cc: Magnus Damm <da...@opensource.se>
> > Cc: Samuel Ortiz <sa...@linux.intel.com>
> ping

This one slipped through...
I just applied a similar patch from Marek Vasut, are you ok with that ?

Cheers,
Samuel.

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

Uwe Kleine-König

unread,

Oct 19, 2010, 9:10:01 AM10/19/10

to

On Tue, Oct 19, 2010 at 12:31:31PM +0200, Samuel Ortiz wrote:
> Hi Uwe,
>
> On Tue, Oct 19, 2010 at 09:19:51AM +0200, Uwe Kleine-K�nig wrote:
> > Hello,
> >
> > On Tue, Mar 02, 2010 at 05:22:33PM +0100, Uwe Kleine-K�nig wrote:
> > > tc6393xb_mmc_resources (which was marked __devinitdata) is used in
> > > tc6393xb_mmc_enable() and tc6393xb_mmc_resume() which both are functions
> > > living in .text. This is not save with CONFIG_HOTPLUG=n.
> > >
> > > This was introduced in
> > >
> > > 64e8867 (mfd: tmio_mmc hardware abstraction for CNF area)
> > >
> > > Signed-off-by: Uwe Kleine-K�nig <u.klein...@pengutronix.de>
> > > Cc: Ian Molton <i...@mnementh.co.uk>
> > > Cc: Magnus Damm <da...@opensource.se>
> > > Cc: Samuel Ortiz <sa...@linux.intel.com>
> > ping
> This one slipped through...
> I just applied a similar patch from Marek Vasut, are you ok with that ?

Hmm, cannot find it, neither in next nor in your tree.

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-K�nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |

Samuel Ortiz

unread,

Oct 19, 2010, 9:30:01 AM10/19/10

to

On Tue, Oct 19, 2010 at 03:07:05PM +0200, Uwe Kleine-K�nig wrote:
> On Tue, Oct 19, 2010 at 12:31:31PM +0200, Samuel Ortiz wrote:
> > Hi Uwe,
> >
> > On Tue, Oct 19, 2010 at 09:19:51AM +0200, Uwe Kleine-K�nig wrote:
> > > Hello,
> > >
> > > On Tue, Mar 02, 2010 at 05:22:33PM +0100, Uwe Kleine-K�nig wrote:
> > > > tc6393xb_mmc_resources (which was marked __devinitdata) is used in
> > > > tc6393xb_mmc_enable() and tc6393xb_mmc_resume() which both are functions
> > > > living in .text. This is not save with CONFIG_HOTPLUG=n.
> > > >
> > > > This was introduced in
> > > >
> > > > 64e8867 (mfd: tmio_mmc hardware abstraction for CNF area)
> > > >
> > > > Signed-off-by: Uwe Kleine-K�nig <u.klein...@pengutronix.de>
> > > > Cc: Ian Molton <i...@mnementh.co.uk>
> > > > Cc: Magnus Damm <da...@opensource.se>
> > > > Cc: Samuel Ortiz <sa...@linux.intel.com>
> > > ping
> > This one slipped through...
> > I just applied a similar patch from Marek Vasut, are you ok with that ?
> Hmm, cannot find it, neither in next nor in your tree.

I just pushed it now.
See http://www.spinics.net/lists/arm-kernel/msg101220.html if you still can't
get it.

Cheers,
Samuel.

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

Uwe Kleine-König

unread,

Oct 19, 2010, 9:40:03 AM10/19/10

to

On Tue, Oct 19, 2010 at 03:22:29PM +0200, Samuel Ortiz wrote:
> On Tue, Oct 19, 2010 at 03:07:05PM +0200, Uwe Kleine-K�nig wrote:
> > On Tue, Oct 19, 2010 at 12:31:31PM +0200, Samuel Ortiz wrote:
> > > Hi Uwe,
> > >
> > > On Tue, Oct 19, 2010 at 09:19:51AM +0200, Uwe Kleine-K�nig wrote:
> > > > Hello,
> > > >
> > > > On Tue, Mar 02, 2010 at 05:22:33PM +0100, Uwe Kleine-K�nig wrote:
> > > > > tc6393xb_mmc_resources (which was marked __devinitdata) is used in
> > > > > tc6393xb_mmc_enable() and tc6393xb_mmc_resume() which both are functions
> > > > > living in .text. This is not save with CONFIG_HOTPLUG=n.
> > > > >
> > > > > This was introduced in
> > > > >
> > > > > 64e8867 (mfd: tmio_mmc hardware abstraction for CNF area)
> > > > >
> > > > > Signed-off-by: Uwe Kleine-K�nig <u.klein...@pengutronix.de>
> > > > > Cc: Ian Molton <i...@mnementh.co.uk>
> > > > > Cc: Magnus Damm <da...@opensource.se>
> > > > > Cc: Samuel Ortiz <sa...@linux.intel.com>
> > > > ping
> > > This one slipped through...
> > > I just applied a similar patch from Marek Vasut, are you ok with that ?
> > Hmm, cannot find it, neither in next nor in your tree.
> I just pushed it now.
> See http://www.spinics.net/lists/arm-kernel/msg101220.html if you still can't
> get it.

the change is identical, so OK. I would have written "This patch fixes
a section mismatch.", not "Also, this causes a section mismatch."

But I don't care much.

Thanks
Uwe

--
Pengutronix e.K. | Uwe Kleine-K�nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |

Samuel Ortiz

unread,

Oct 19, 2010, 9:40:03 AM10/19/10

to

Thanks for checking.

Cheers,
Samuel.

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