dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'regulator/fix/max77686' into tmp

This commit is contained in:
Mark Brown 2013-02-06 11:28:48 +00:00
parent 88b62b915b b19f575898
commit ac58291c75
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/regulator/max77686.c
View File

@ -379,9 +379,10 @@ static struct regulator_desc regulators[] = {
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev, static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev,
struct max77686_platform_data *pdata) struct max77686_platform_data *pdata)
{ {
struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct device_node *pmic_np, *regulators_np; struct device_node *pmic_np, *regulators_np;
struct max77686_regulator_data *rdata; struct max77686_regulator_data *rdata;
struct of_regulator_match rmatch; struct of_regulator_match rmatch;
@ -390,15 +391,15 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
pmic_np = iodev->dev->of_node; pmic_np = iodev->dev->of_node;
regulators_np = of_find_node_by_name(pmic_np, "voltage-regulators"); regulators_np = of_find_node_by_name(pmic_np, "voltage-regulators");
if (!regulators_np) { if (!regulators_np) {
dev_err(iodev->dev, "could not find regulators sub-node\n"); dev_err(&pdev->dev, "could not find regulators sub-node\n");
return -EINVAL; return -EINVAL;
} }
pdata->num_regulators = ARRAY_SIZE(regulators); pdata->num_regulators = ARRAY_SIZE(regulators);
rdata = devm_kzalloc(iodev->dev, sizeof(*rdata) * rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) *
pdata->num_regulators, GFP_KERNEL); pdata->num_regulators, GFP_KERNEL);
if (!rdata) { if (!rdata) {
dev_err(iodev->dev, dev_err(&pdev->dev,
"could not allocate memory for regulator data\n"); "could not allocate memory for regulator data\n");
return -ENOMEM; return -ENOMEM;
} }
@ -407,7 +408,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
rmatch.name = regulators[i].name; rmatch.name = regulators[i].name;
rmatch.init_data = NULL; rmatch.init_data = NULL;
rmatch.of_node = NULL; rmatch.of_node = NULL;
of_regulator_match(iodev->dev, regulators_np, &rmatch, 1); of_regulator_match(&pdev->dev, regulators_np, &rmatch, 1);
rdata[i].initdata = rmatch.init_data; rdata[i].initdata = rmatch.init_data;
rdata[i].of_node = rmatch.of_node; rdata[i].of_node = rmatch.of_node;
} }
@ -417,7 +418,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
return 0; return 0;
} }
#else #else
static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev, static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev,
struct max77686_platform_data *pdata) struct max77686_platform_data *pdata)
{ {
return 0; return 0;
@ -440,7 +441,7 @@ static int max77686_pmic_probe(struct platform_device *pdev)
} }
if (iodev->dev->of_node) { if (iodev->dev->of_node) {
ret = max77686_pmic_dt_parse_pdata(iodev, pdata); ret = max77686_pmic_dt_parse_pdata(pdev, pdata);
if (ret) if (ret)
return ret; return ret;
} }