Commit b68b45d7 authored by Mark Brown's avatar Mark Brown

regulator: wm8994: Allow registration with no platform data

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b1a86831
...@@ -168,9 +168,6 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev) ...@@ -168,9 +168,6 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1); dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
if (!pdata)
return -ENODEV;
ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_ldo), GFP_KERNEL); ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_ldo), GFP_KERNEL);
if (ldo == NULL) { if (ldo == NULL) {
dev_err(&pdev->dev, "Unable to allocate private data\n"); dev_err(&pdev->dev, "Unable to allocate private data\n");
...@@ -192,9 +189,10 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev) ...@@ -192,9 +189,10 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
ldo->is_enabled = true; ldo->is_enabled = true;
config.dev = wm8994->dev; config.dev = wm8994->dev;
config.init_data = pdata->ldo[id].init_data;
config.driver_data = ldo; config.driver_data = ldo;
config.regmap = wm8994->regmap; config.regmap = wm8994->regmap;
if (pdata)
config.init_data = pdata->ldo[id].init_data;
ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &config); ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &config);
if (IS_ERR(ldo->regulator)) { if (IS_ERR(ldo->regulator)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment