[PATCH] regulator: Get rid of lockdep warning

[PATCH] regulator: Get rid of lockdep warning

[Ameya Palande]

From: Ameya Palande <ameya.palande@nokia.com>

WARNING: at kernel/lockdep.c:2706 sysfs_add_file_mode+0x4c/0xa8()

Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
CC: Liam Girdwood <lrg@slimlogic.co.uk>
CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
CC: David Brownell <dbrownell@users.sourceforge.net>
---
 drivers/regulator/core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index c7bbe30..2ad3272 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1045,6 +1045,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
 		regulator->dev_attr.attr.owner = THIS_MODULE;
 		regulator->dev_attr.attr.mode = 0444;
 		regulator->dev_attr.show = device_requested_uA_show;
+		sysfs_attr_init(&regulator->dev_attr.attr);
 		err = device_create_file(dev, &regulator->dev_attr);
 		if (err < 0) {
 			printk(KERN_WARNING "%s: could not add regulator_dev"
-- 
1.6.3.3

Re: [PATCH] regulator: Get rid of lockdep warning

[Mark Brown]

On Fri, Mar 12, 2010 at 07:16:36PM +0200, Ameya Palande wrote:

> @@ -1045,6 +1045,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
>  		regulator->dev_attr.attr.owner = THIS_MODULE;
>  		regulator->dev_attr.attr.mode = 0444;
>  		regulator->dev_attr.show = device_requested_uA_show;
> +		sysfs_attr_init(&regulator->dev_attr.attr);
>  		err = device_create_file(dev, &regulator->dev_attr);
>  		if (err < 0) {
>  			printk(KERN_WARNING "%s: could not add regulator_dev"

Without having looked at what sysfs_attr_init() is actually doing it
looks odd to be calling an init() function after having initialised
several members of the structure - I'd expect to see the call happen
before we start writing stuff in?

[PATCHv2] regulator: Get rid of lockdep warning

[Ameya Palande]

From: Ameya Palande <ameya.palande@nokia.com>

WARNING: at kernel/lockdep.c:2706 sysfs_add_file_mode+0x4c/0xa8()

Difference between v1 and v2:
Moved sysfs_attr_init() call as first one to access the structure.

Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
CC: Liam Girdwood <lrg@slimlogic.co.uk>
CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
CC: David Brownell <dbrownell@users.sourceforge.net>
---
 drivers/regulator/core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index c7bbe30..5af16c2 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1038,6 +1038,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
 			goto overflow_err;
 
 		regulator->dev = dev;
+		sysfs_attr_init(&regulator->dev_attr.attr);
 		regulator->dev_attr.attr.name = kstrdup(buf, GFP_KERNEL);
 		if (regulator->dev_attr.attr.name == NULL)
 			goto attr_name_err;
-- 
1.6.3.3

Re: [PATCHv2] regulator: Get rid of lockdep warning

[Mark Brown]

On Fri, Mar 12, 2010 at 08:09:01PM +0200, Ameya Palande wrote:
> From: Ameya Palande <ameya.palande@nokia.com>
> 
> WARNING: at kernel/lockdep.c:2706 sysfs_add_file_mode+0x4c/0xa8()
> 
> Difference between v1 and v2:
> Moved sysfs_attr_init() call as first one to access the structure.
> 
> Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
> CC: Liam Girdwood <lrg@slimlogic.co.uk>
> CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
> CC: David Brownell <dbrownell@users.sourceforge.net>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Re: [PATCHv2] regulator: Get rid of lockdep warning

[Liam Girdwood]

On Fri, 2010-03-12 at 20:09 +0200, Ameya Palande wrote:
> From: Ameya Palande <ameya.palande@nokia.com>
> 
> WARNING: at kernel/lockdep.c:2706 sysfs_add_file_mode+0x4c/0xa8()
> 
> Difference between v1 and v2:
> Moved sysfs_attr_init() call as first one to access the structure.
> 
> Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
> CC: Liam Girdwood <lrg@slimlogic.co.uk>
> CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
> CC: David Brownell <dbrownell@users.sourceforge.net>
> ---

Applied.

Thanks.

Liam

-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk