[PATCH] regulator: remove driver_data direct access of struct device

[PATCH] regulator: remove driver_data direct access of struct device

[Greg Kroah-Hartman]

From: Greg Kroah-Hartman <gregkh@suse.de>

In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device.  Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.


Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/regulator/wm8400-regulator.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -320,7 +320,7 @@ static int __devinit wm8400_regulator_pr
 	struct regulator_dev *rdev;
 
 	rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
-		pdev->dev.platform_data, pdev->dev.driver_data);
+		pdev->dev.platform_data, dev_get_drvdata(&pdev->dev));
 
 	if (IS_ERR(rdev))
 		return PTR_ERR(rdev);
@@ -359,7 +359,7 @@ static struct platform_driver wm8400_reg
 int wm8400_register_regulator(struct device *dev, int reg,
 			      struct regulator_init_data *initdata)
 {
-	struct wm8400 *wm8400 = dev->driver_data;
+	struct wm8400 *wm8400 = dev_get_drvdata(dev);
 
 	if (wm8400->regulators[reg].name)
 		return -EBUSY;
@@ -369,8 +369,8 @@ int wm8400_register_regulator(struct dev
 	wm8400->regulators[reg].name = "wm8400-regulator";
 	wm8400->regulators[reg].id = reg;
 	wm8400->regulators[reg].dev.parent = dev;
-	wm8400->regulators[reg].dev.driver_data = wm8400;
 	wm8400->regulators[reg].dev.platform_data = initdata;
+	dev_set_drvdata(&wm8400->regulators[reg].dev, wm8400);
 
 	return platform_device_register(&wm8400->regulators[reg]);
 }

Re: [PATCH] regulator: remove driver_data direct access of struct device

[Mark Brown]

On Thu, Apr 30, 2009 at 03:21:37PM -0700, Greg Kroah-Hartman wrote:

> In the near future, the driver core is going to not allow direct access
> to the driver_data pointer in struct device.  Instead, the functions
> dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
> have been around since the beginning, so are backwards compatible with
> all older kernel versions.

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

Re: [PATCH] regulator: remove driver_data direct access of struct device

[Greg KH]

On Fri, May 01, 2009 at 10:19:29AM +0100, Mark Brown wrote:
> On Thu, Apr 30, 2009 at 03:21:37PM -0700, Greg Kroah-Hartman wrote:
> 
> > In the near future, the driver core is going to not allow direct access
> > to the driver_data pointer in struct device.  Instead, the functions
> > dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
> > have been around since the beginning, so are backwards compatible with
> > all older kernel versions.
> 
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Thanks.  Is there a regulator kernel tree that this patch should go
through, or can I take it through my driver core tree?

thanks,

greg k-h

Re: [PATCH] regulator: remove driver_data direct access of struct device

[Liam Girdwood]

On Fri, 2009-05-01 at 08:23 -0700, Greg KH wrote:
> On Fri, May 01, 2009 at 10:19:29AM +0100, Mark Brown wrote:
> > On Thu, Apr 30, 2009 at 03:21:37PM -0700, Greg Kroah-Hartman wrote:
> > 
> > > In the near future, the driver core is going to not allow direct access
> > > to the driver_data pointer in struct device.  Instead, the functions
> > > dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
> > > have been around since the beginning, so are backwards compatible with
> > > all older kernel versions.
> > 
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> 
> Thanks.  Is there a regulator kernel tree that this patch should go
> through, or can I take it through my driver core tree?
> 

I'll apply it to the voltage regulator tree shortly.

Thanks

Liam