diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 18:27:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 18:27:37 +0200 |
| commit | d3bf80bff13597004b5724ee4549cd68eb0badf0 (patch) | |
| tree | 67f0a50e3135acd63348882d8ef836b498450f5f /drivers/regulator/wm8400-regulator.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff) | |
| parent | regulator/max1586: fix V3 gain calculation integer overflow (diff) | |
| download | linux-d3bf80bff13597004b5724ee4549cd68eb0badf0.tar.xz linux-d3bf80bff13597004b5724ee4549cd68eb0badf0.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator/max1586: fix V3 gain calculation integer overflow
regulator/max1586: support increased V3 voltage range
regulator: lp3971 - fix driver link error when built-in.
LP3971 PMIC regulator driver (updated and combined version)
regulator: remove driver_data direct access of struct device
regulator: Set MODULE_ALIAS for regulator drivers
regulator: Support list_voltage for fixed voltage regulator
regulator: Move regulator drivers to subsys_initcall()
regulator: build fix for powerpc - renamed show_state
regulator: add userspace-consumer driver
Maxim 1586 regulator driver
Diffstat (limited to 'drivers/regulator/wm8400-regulator.c')
| -rw-r--r-- | drivers/regulator/wm8400-regulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c index 157426029071..d9a2c988c6e7 100644 --- a/drivers/regulator/wm8400-regulator.c +++ b/drivers/regulator/wm8400-regulator.c @@ -320,7 +320,7 @@ static int __devinit wm8400_regulator_probe(struct platform_device *pdev) struct regulator_dev *rdev; rdev = regulator_register(®ulators[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_regulator_driver = { 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 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.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]); } @@ -380,7 +380,7 @@ static int __init wm8400_regulator_init(void) { return platform_driver_register(&wm8400_regulator_driver); } -module_init(wm8400_regulator_init); +subsys_initcall(wm8400_regulator_init); static void __exit wm8400_regulator_exit(void) { |