lkml.org 
[lkml]   [2010]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 13/14] Regulators: wm8400 - cleanup platform driver data handling
Date
Driver data set by platform_set_drvdata() is for private use of
the driver currently bound to teh device and not for use by parent,
subsystem and anyone else.

Also have wm8400_register_regulator() accept 'sturct wm8400 *'
instead of generic device structure.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/regulator/wm8400-regulator.c | 13 +++++++------
include/linux/mfd/wm8400.h | 4 +++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index d9a2c98..71b89e8 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -317,14 +317,17 @@ static struct regulator_desc regulators[] = {

static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
{
+ struct wm8400 *wm8400 = container_of(pdev, struct wm8400, regulators[pdev->id]);
struct regulator_dev *rdev;

rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
- pdev->dev.platform_data, dev_get_drvdata(&pdev->dev));
+ pdev->dev.platform_data, wm8400);

if (IS_ERR(rdev))
return PTR_ERR(rdev);

+ platform_set_drvdata(pdev, rdev);
+
return 0;
}

@@ -332,6 +335,7 @@ static int __devexit wm8400_regulator_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);

+ platform_set_drvdata(pdev, NULL);
regulator_unregister(rdev);

return 0;
@@ -356,11 +360,9 @@ static struct platform_driver wm8400_regulator_driver = {
* @param reg The regulator to control.
* @param initdata Regulator initdata for the regulator.
*/
-int wm8400_register_regulator(struct device *dev, int reg,
+int wm8400_register_regulator(struct wm8400 *wm8400, int reg,
struct regulator_init_data *initdata)
{
- struct wm8400 *wm8400 = dev_get_drvdata(dev);
-
if (wm8400->regulators[reg].name)
return -EBUSY;

@@ -368,9 +370,8 @@ int wm8400_register_regulator(struct device *dev, int reg,

wm8400->regulators[reg].name = "wm8400-regulator";
wm8400->regulators[reg].id = reg;
- wm8400->regulators[reg].dev.parent = dev;
+ wm8400->regulators[reg].dev.parent = wm8400->dev;
wm8400->regulators[reg].dev.platform_data = initdata;
- dev_set_drvdata(&wm8400->regulators[reg].dev, wm8400);

return platform_device_register(&wm8400->regulators[reg]);
}
diff --git a/include/linux/mfd/wm8400.h b/include/linux/mfd/wm8400.h
index b46b566..f9e49cc 100644
--- a/include/linux/mfd/wm8400.h
+++ b/include/linux/mfd/wm8400.h
@@ -34,7 +34,9 @@ struct wm8400_platform_data {
int (*platform_init)(struct device *dev);
};

-int wm8400_register_regulator(struct device *dev, int reg,
+struct wm8400;
+
+int wm8400_register_regulator(struct wm8400 *wm8400, int reg,
struct regulator_init_data *initdata);

#endif


\
 
 \ /
  Last update: 2010-02-24 08:47    [from the cache]
©2003-2011 Jasper Spaans