projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mfd: mfd_cell is now implicitly available to mc13xxx drivers
[deliverable/linux.git]
/
drivers
/
regulator
/
mc13783-regulator.c
diff --git
a/drivers/regulator/mc13783-regulator.c
b/drivers/regulator/mc13783-regulator.c
index 3e5d0c3b4e53134e84fa1ce2b5b32413de9b9a65..23249cb0a8bdcc6be50b0ccb52e89f5e3cf5fa36 100644
(file)
--- a/
drivers/regulator/mc13783-regulator.c
+++ b/
drivers/regulator/mc13783-regulator.c
@@
-15,6
+15,7
@@
#include <linux/regulator/driver.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/regulator/driver.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
+#include <linux/mfd/core.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/err.h>
@@
-336,8
+337,7
@@
static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
{
struct mc13xxx_regulator_priv *priv;
struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
{
struct mc13xxx_regulator_priv *priv;
struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
- struct mc13783_regulator_platform_data *pdata =
- dev_get_platdata(&pdev->dev);
+ struct mc13783_regulator_platform_data *pdata = mfd_get_data(pdev);
struct mc13783_regulator_init_data *init_data;
int i, ret;
struct mc13783_regulator_init_data *init_data;
int i, ret;
@@
-381,8
+381,7
@@
err:
static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
{
struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
{
struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
- struct mc13783_regulator_platform_data *pdata =
- dev_get_platdata(&pdev->dev);
+ struct mc13783_regulator_platform_data *pdata = mfd_get_data(pdev);
int i;
platform_set_drvdata(pdev, NULL);
int i;
platform_set_drvdata(pdev, NULL);
This page took
0.026889 seconds
and
5
git commands to generate.