[PATCH] drivers:uio:fix section mismatch in uio_pdrv_genirq.c

[PATCH] drivers:uio:fix section mismatch in uio_pdrv_genirq.c

[Wanlong Gao]

From: Wanlong Gao <gaowanlong@cn.fujitsu.com>

Remove the __devinitconst to fix the section mismatch.

WARNING: drivers/uio/built-in.o(.data+0x2e8): Section mismatch in
reference from the variable uio_pdrv_genirq to the variable
.devinit.rodata:uio_of_genirq_match
The variable uio_pdrv_genirq references
the variable __devinitconst uio_of_genirq_match
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the
variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
*_console

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
---
 drivers/uio/uio_pdrv_genirq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index bae96d2..0b2ed71 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -253,7 +253,7 @@ static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
 };
 
 #ifdef CONFIG_OF
-static const struct of_device_id __devinitconst uio_of_genirq_match[] = {
+static const struct of_device_id uio_of_genirq_match[] = {
 	{ /* empty for now */ },
 };
 MODULE_DEVICE_TABLE(of, uio_of_genirq_match);
-- 
1.7.4.1

[PATCH v2] drivers:uio:change the goto label to consistent with others

[Wanlong Gao]

From: Wanlong Gao <gaowanlong@cn.fujitsu.com>

sorry for v1's typo mistake.
Thanks

Remove one *goto* label in uio.c.

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
---
 drivers/uio/uio.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index d2efe82..c89f12a 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -750,14 +750,13 @@ static int uio_major_init(void)
 
 	uio_major = MAJOR(uio_dev);
 	uio_cdev = cdev;
-	result = 0;
-out:
-	return result;
+	return 0;
 out_put:
 	kobject_put(&cdev->kobj);
 out_unregister:
 	unregister_chrdev_region(uio_dev, UIO_MAX_DEVICES);
-	goto out;
+out:
+	return result;
 }
 
 static void uio_major_cleanup(void)
-- 
1.7.4.1

Re: [PATCH v2] drivers:uio:change the goto label to consistent with others

[Hans J. Koch]

On Sat, Aug 20, 2011 at 12:12:08PM +0800, Wanlong Gao wrote:
> From: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> 
> sorry for v1's typo mistake.
> Thanks
> 
> Remove one *goto* label in uio.c.

Nice, that makes it a bit cleaner.

Thanks,
Hans

> 
> Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>

Signed-off-by: "Hans J. Koch" <hjk@hansjkoch.de>

> ---
>  drivers/uio/uio.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
> index d2efe82..c89f12a 100644
> --- a/drivers/uio/uio.c
> +++ b/drivers/uio/uio.c
> @@ -750,14 +750,13 @@ static int uio_major_init(void)
>  
>  	uio_major = MAJOR(uio_dev);
>  	uio_cdev = cdev;
> -	result = 0;
> -out:
> -	return result;
> +	return 0;
>  out_put:
>  	kobject_put(&cdev->kobj);
>  out_unregister:
>  	unregister_chrdev_region(uio_dev, UIO_MAX_DEVICES);
> -	goto out;
> +out:
> +	return result;
>  }
>  
>  static void uio_major_cleanup(void)
> -- 
> 1.7.4.1
> 
> 

Re: [PATCH] drivers:uio:fix section mismatch in uio_pdrv_genirq.c

[Hans J. Koch]

On Sat, Aug 20, 2011 at 12:12:07PM +0800, Wanlong Gao wrote:
> From: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> 
> Remove the __devinitconst to fix the section mismatch.
> 
> WARNING: drivers/uio/built-in.o(.data+0x2e8): Section mismatch in
> reference from the variable uio_pdrv_genirq to the variable

Hmm, I don't see that section mismatch here when I do a
make CONFIG_DEBUG_SECTION_MISMATCH=y. How do you produce that?

> .devinit.rodata:uio_of_genirq_match
> The variable uio_pdrv_genirq references
> the variable __devinitconst uio_of_genirq_match
> If the reference is valid then annotate the
> variable with __init* or __refdata (see linux/init.h) or name the
> variable:
> *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
> *_console

Is just removing the __devinitconst really the best solution?

Thanks,
Hans

> 
> Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> ---
>  drivers/uio/uio_pdrv_genirq.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
> index bae96d2..0b2ed71 100644
> --- a/drivers/uio/uio_pdrv_genirq.c
> +++ b/drivers/uio/uio_pdrv_genirq.c
> @@ -253,7 +253,7 @@ static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
>  };
>  
>  #ifdef CONFIG_OF
> -static const struct of_device_id __devinitconst uio_of_genirq_match[] = {
> +static const struct of_device_id uio_of_genirq_match[] = {
>  	{ /* empty for now */ },
>  };
>  MODULE_DEVICE_TABLE(of, uio_of_genirq_match);
> -- 
> 1.7.4.1
> 
> 

Re: [PATCH] drivers:uio:fix section mismatch in uio_pdrv_genirq.c

[Wanlong Gao]

On Mon, 2011-08-22 at 14:03 +0200, Hans J. Koch wrote:
> On Sat, Aug 20, 2011 at 12:12:07PM +0800, Wanlong Gao wrote:
> > From: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> > 
> > Remove the __devinitconst to fix the section mismatch.
> > 
> > WARNING: drivers/uio/built-in.o(.data+0x2e8): Section mismatch in
> > reference from the variable uio_pdrv_genirq to the variable
> 
> Hmm, I don't see that section mismatch here when I do a
> make CONFIG_DEBUG_SECTION_MISMATCH=y. How do you produce that?

I produced in arch of mips like
make O=../latest ARCH=mips CROSS_COMILE=mips-linux-

> 
> > .devinit.rodata:uio_of_genirq_match
> > The variable uio_pdrv_genirq references
> > the variable __devinitconst uio_of_genirq_match
> > If the reference is valid then annotate the
> > variable with __init* or __refdata (see linux/init.h) or name the
> > variable:
> > *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
> > *_console
> 
> Is just removing the __devinitconst really the best solution?
> 
> Thanks,
> Hans

Do you have any better suggestions?

Thanks
-Wanlong Gao

> 
> > 
> > Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> > ---
> >  drivers/uio/uio_pdrv_genirq.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
> > index bae96d2..0b2ed71 100644
> > --- a/drivers/uio/uio_pdrv_genirq.c
> > +++ b/drivers/uio/uio_pdrv_genirq.c
> > @@ -253,7 +253,7 @@ static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
> >  };
> >  
> >  #ifdef CONFIG_OF
> > -static const struct of_device_id __devinitconst uio_of_genirq_match[] = {
> > +static const struct of_device_id uio_of_genirq_match[] = {
> >  	{ /* empty for now */ },
> >  };
> >  MODULE_DEVICE_TABLE(of, uio_of_genirq_match);
> > -- 
> > 1.7.4.1
> > 
> > 

Re: [PATCH] drivers:uio:fix section mismatch in uio_pdrv_genirq.c

[Hans J. Koch]

[Added linux-mips to Cc:]

On Mon, Aug 22, 2011 at 08:50:41PM +0800, Wanlong Gao wrote:
> On Mon, 2011-08-22 at 14:03 +0200, Hans J. Koch wrote:
> > On Sat, Aug 20, 2011 at 12:12:07PM +0800, Wanlong Gao wrote:
> > > From: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> > > 
> > > Remove the __devinitconst to fix the section mismatch.
> > > 
> > > WARNING: drivers/uio/built-in.o(.data+0x2e8): Section mismatch in
> > > reference from the variable uio_pdrv_genirq to the variable
> > 
> > Hmm, I don't see that section mismatch here when I do a
> > make CONFIG_DEBUG_SECTION_MISMATCH=y. How do you produce that?
> 
> I produced in arch of mips like
> make O=../latest ARCH=mips CROSS_COMILE=mips-linux-

That seems to be a MIPS specific problem. It was tested OK on arm and x86.

> 
> > 
> > > .devinit.rodata:uio_of_genirq_match
> > > The variable uio_pdrv_genirq references
> > > the variable __devinitconst uio_of_genirq_match
> > > If the reference is valid then annotate the
> > > variable with __init* or __refdata (see linux/init.h) or name the
> > > variable:
> > > *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
> > > *_console
> > 
> > Is just removing the __devinitconst really the best solution?
> > 
> > Thanks,
> > Hans
> 
> Do you have any better suggestions?

No, maybe the MIPS guys can shed some light on it.

Thanks,
Hans

> 
> Thanks
> -Wanlong Gao
> 
> > 
> > > 
> > > Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> > > ---
> > >  drivers/uio/uio_pdrv_genirq.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
> > > index bae96d2..0b2ed71 100644
> > > --- a/drivers/uio/uio_pdrv_genirq.c
> > > +++ b/drivers/uio/uio_pdrv_genirq.c
> > > @@ -253,7 +253,7 @@ static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
> > >  };
> > >  
> > >  #ifdef CONFIG_OF
> > > -static const struct of_device_id __devinitconst uio_of_genirq_match[] = {
> > > +static const struct of_device_id uio_of_genirq_match[] = {
> > >  	{ /* empty for now */ },
> > >  };
> > >  MODULE_DEVICE_TABLE(of, uio_of_genirq_match);
> > > -- 
> > > 1.7.4.1
> > > 
> > > 
> 
> 
> 

Re: [PATCH] drivers:uio:fix section mismatch in uio_pdrv_genirq.c

[Wanlong Gao]

On Mon, 2011-08-22 at 16:20 +0200, Hans J. Koch wrote:
> [Added linux-mips to Cc:]
> 
> On Mon, Aug 22, 2011 at 08:50:41PM +0800, Wanlong Gao wrote:
> > On Mon, 2011-08-22 at 14:03 +0200, Hans J. Koch wrote:
> > > On Sat, Aug 20, 2011 at 12:12:07PM +0800, Wanlong Gao wrote:
> > > > From: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> > > > 
> > > > Remove the __devinitconst to fix the section mismatch.
> > > > 
> > > > WARNING: drivers/uio/built-in.o(.data+0x2e8): Section mismatch in
> > > > reference from the variable uio_pdrv_genirq to the variable
> > > 
> > > Hmm, I don't see that section mismatch here when I do a
> > > make CONFIG_DEBUG_SECTION_MISMATCH=y. How do you produce that?
> > 
> > I produced in arch of mips like
> > make O=../latest ARCH=mips CROSS_COMILE=mips-linux-
> 
> That seems to be a MIPS specific problem. It was tested OK on arm and x86.

Yeah, I see.

> 
> > 
> > > 
> > > > .devinit.rodata:uio_of_genirq_match
> > > > The variable uio_pdrv_genirq references
> > > > the variable __devinitconst uio_of_genirq_match
> > > > If the reference is valid then annotate the
> > > > variable with __init* or __refdata (see linux/init.h) or name the
> > > > variable:
> > > > *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
> > > > *_console
> > > 
> > > Is just removing the __devinitconst really the best solution?
> > > 
> > > Thanks,
> > > Hans
> > 
> > Do you have any better suggestions?
> 
> No, maybe the MIPS guys can shed some light on it.

It will be better.

Thanks
-Wanlong Gao
> 
> Thanks,
> Hans
> 
> > 
> > Thanks
> > -Wanlong Gao
> > 
> > > 
> > > > 
> > > > Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> > > > ---
> > > >  drivers/uio/uio_pdrv_genirq.c |    2 +-
> > > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > > 
> > > > diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
> > > > index bae96d2..0b2ed71 100644
> > > > --- a/drivers/uio/uio_pdrv_genirq.c
> > > > +++ b/drivers/uio/uio_pdrv_genirq.c
> > > > @@ -253,7 +253,7 @@ static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
> > > >  };
> > > >  
> > > >  #ifdef CONFIG_OF
> > > > -static const struct of_device_id __devinitconst uio_of_genirq_match[] = {
> > > > +static const struct of_device_id uio_of_genirq_match[] = {
> > > >  	{ /* empty for now */ },
> > > >  };
> > > >  MODULE_DEVICE_TABLE(of, uio_of_genirq_match);
> > > > -- 
> > > > 1.7.4.1
> > > > 
> > > > 
> > 
> > 
> >