[patch 8/9] smsc-ircc2: fix section reference mismatches

[patch 8/9] smsc-ircc2: fix section reference mismatches

[akpm]

From: Dmitry Torokhov <dtor@insightbb.com>

subsystem_configurations array is only used by an __init function,
therefore it should be marked __initdata, not __devinitdata.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/net/irda/smsc-ircc2.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/net/irda/smsc-ircc2.c~smsc-ircc2-fix-section-reference-mismatches drivers/net/irda/smsc-ircc2.c
--- a/drivers/net/irda/smsc-ircc2.c~smsc-ircc2-fix-section-reference-mismatches
+++ a/drivers/net/irda/smsc-ircc2.c
@@ -2353,7 +2353,7 @@ static int __init smsc_superio_lpc(unsig
 #ifdef CONFIG_PCI
 #define PCIID_VENDOR_INTEL 0x8086
 #define PCIID_VENDOR_ALI 0x10b9
-static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __devinitdata = {
+static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __initdata = {
 	{
 		.vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */
 		.device = 0x24cc,
_

Re: [patch 8/9] smsc-ircc2: fix section reference mismatches

[Jeff Garzik]

akpm@osdl.org wrote:
> From: Dmitry Torokhov <dtor@insightbb.com>
> 
> subsystem_configurations array is only used by an __init function,
> therefore it should be marked __initdata, not __devinitdata.
> 
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
> 
>  drivers/net/irda/smsc-ircc2.c |    2 +-
>  1 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN drivers/net/irda/smsc-ircc2.c~smsc-ircc2-fix-section-reference-mismatches drivers/net/irda/smsc-ircc2.c
> --- a/drivers/net/irda/smsc-ircc2.c~smsc-ircc2-fix-section-reference-mismatches
> +++ a/drivers/net/irda/smsc-ircc2.c
> @@ -2353,7 +2353,7 @@ static int __init smsc_superio_lpc(unsig
>  #ifdef CONFIG_PCI
>  #define PCIID_VENDOR_INTEL 0x8086
>  #define PCIID_VENDOR_ALI 0x10b9
> -static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __devinitdata = {
> +static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __initdata = {

Are you sure this fully solves the problem?

It seems like the functions referenced inside this are inappropriately 
marked as well...

Re: [patch 8/9] smsc-ircc2: fix section reference mismatches

[Dmitry Torokhov]

On 7/7/06, Jeff Garzik <jeff@garzik.org> wrote:
> akpm@osdl.org wrote:
> > From: Dmitry Torokhov <dtor@insightbb.com>
> >
> > subsystem_configurations array is only used by an __init function,
> > therefore it should be marked __initdata, not __devinitdata.
> >
> > Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> > Signed-off-by: Andrew Morton <akpm@osdl.org>
> > ---
> >
> >  drivers/net/irda/smsc-ircc2.c |    2 +-
> >  1 files changed, 1 insertion(+), 1 deletion(-)
> >
> > diff -puN drivers/net/irda/smsc-ircc2.c~smsc-ircc2-fix-section-reference-mismatches drivers/net/irda/smsc-ircc2.c
> > --- a/drivers/net/irda/smsc-ircc2.c~smsc-ircc2-fix-section-reference-mismatches
> > +++ a/drivers/net/irda/smsc-ircc2.c
> > @@ -2353,7 +2353,7 @@ static int __init smsc_superio_lpc(unsig
> >  #ifdef CONFIG_PCI
> >  #define PCIID_VENDOR_INTEL 0x8086
> >  #define PCIID_VENDOR_ALI 0x10b9
> > -static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __devinitdata = {
> > +static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __initdata = {
>
> Are you sure this fully solves the problem?
>

I think so, at least I see no more warnigns...

> It seems like the functions referenced inside this are inappropriately
> marked as well...
>

subsystem_configurations is only used from
smsc_ircc_preconfigure_subsystems(), which is called from
smsc_ircc_init(). Both of these are __init. All methods in
subsystem_configurations are marked as __init as well. Seems logical
that the strcture should be marked __initdata.

-- 
Dmitry