2009-01-01 12:53:06

by Mark Brown

Subject: [PATCH] mfd: Fix section mismatch in da903x

The subdevice removal functions are marked __devexit but are referenced
from the error handling path when probing so are needed even when
__devexit functions are removed.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/mfd/da903x.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
index 0b5bd85..248756f 100644
--- a/drivers/mfd/da903x.c
+++ b/drivers/mfd/da903x.c
@@ -435,13 +435,13 @@ static const struct i2c_device_id da903x_id_table[] = {
};
MODULE_DEVICE_TABLE(i2c, da903x_id_table);

-static int __devexit __remove_subdev(struct device *dev, void *unused)
+static int __remove_subdev(struct device *dev, void *unused)
{
platform_device_unregister(to_platform_device(dev));
return 0;
}

-static int __devexit da903x_remove_subdevs(struct da903x_chip *chip)
+static int da903x_remove_subdevs(struct da903x_chip *chip)
{
return device_for_each_child(chip->dev, NULL, __remove_subdev);
}
--
1.5.6.3

2009-01-02 03:46:52

by Eric Miao

Subject: Re: [PATCH] mfd: Fix section mismatch in da903x

Acked-by: Eric Miao <[email protected]>

Samuel, please help to merge.

On Thu, Jan 1, 2009 at 8:52 PM, Mark Brown <[email protected]> wrote:
> The subdevice removal functions are marked __devexit but are referenced
> from the error handling path when probing so are needed even when
> __devexit functions are removed.
>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/mfd/da903x.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
> index 0b5bd85..248756f 100644
> --- a/drivers/mfd/da903x.c
> +++ b/drivers/mfd/da903x.c
> @@ -435,13 +435,13 @@ static const struct i2c_device_id da903x_id_table[] = {
> };
> MODULE_DEVICE_TABLE(i2c, da903x_id_table);
>
> -static int __devexit __remove_subdev(struct device *dev, void *unused)
> +static int __remove_subdev(struct device *dev, void *unused)
> {
> platform_device_unregister(to_platform_device(dev));
> return 0;
> }
>
> -static int __devexit da903x_remove_subdevs(struct da903x_chip *chip)
> +static int da903x_remove_subdevs(struct da903x_chip *chip)
> {
> return device_for_each_child(chip->dev, NULL, __remove_subdev);
> }
> --
> 1.5.6.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>



--
Cheers
- eric

2009-01-04 14:32:36

by Samuel Ortiz

Subject: Re: [PATCH] mfd: Fix section mismatch in da903x

On Fri, Jan 02, 2009 at 11:46:41AM +0800, Eric Miao wrote:
> Acked-by: Eric Miao <[email protected]>
>
> Samuel, please help to merge.
Applied to the mfd tree, thanks guys.

Cheers,
Samuel.

> On Thu, Jan 1, 2009 at 8:52 PM, Mark Brown <[email protected]> wrote:
> > The subdevice removal functions are marked __devexit but are referenced
> > from the error handling path when probing so are needed even when
> > __devexit functions are removed.
> >
> > Signed-off-by: Mark Brown <[email protected]>
> > ---
> > drivers/mfd/da903x.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
> > index 0b5bd85..248756f 100644
> > --- a/drivers/mfd/da903x.c
> > +++ b/drivers/mfd/da903x.c
> > @@ -435,13 +435,13 @@ static const struct i2c_device_id da903x_id_table[] = {
> > };
> > MODULE_DEVICE_TABLE(i2c, da903x_id_table);
> >
> > -static int __devexit __remove_subdev(struct device *dev, void *unused)
> > +static int __remove_subdev(struct device *dev, void *unused)
> > {
> > platform_device_unregister(to_platform_device(dev));
> > return 0;
> > }
> >
> > -static int __devexit da903x_remove_subdevs(struct da903x_chip *chip)
> > +static int da903x_remove_subdevs(struct da903x_chip *chip)
> > {
> > return device_for_each_child(chip->dev, NULL, __remove_subdev);
> > }
> > --
> > 1.5.6.3
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
> >
>
>
>
> --
> Cheers
> - eric

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