Skip to contentSkip to conversation

regulator: remove driver_data direct access of struct device

PATCH In review Greg Kroah-Hartman 3 participants 4 messages Apr 30, 2009 – May 1, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: remove driver_data direct access of struct device

From: Greg Kroah-Hartman <[email protected]>

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.

---
 drivers/regulator/wm8400-regulator.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/wm8400-regulator.c +3 -3
@@ -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]);
 }
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Greg Kroah-Hartman

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.

author
#2 lore raw
Quoted 9 lines · Mark Brown
Quoted 5 lines · Greg Kroah-Hartman

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.

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

#3 lore raw
Quoted 9 lines · Greg KH
Quoted 8 lines · Mark Brown
Quoted 5 lines · Greg Kroah-Hartman

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.

Quoted 5 lines
Quoted 1 line

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