Commit 2d31b15b authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next

parents 04fcec88 cf06cbb9
...@@ -717,11 +717,6 @@ static int ti_abb_probe(struct platform_device *pdev) ...@@ -717,11 +717,6 @@ static int ti_abb_probe(struct platform_device *pdev)
/* Map ABB resources */ /* Map ABB resources */
pname = "base-address"; pname = "base-address";
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
if (!res) {
dev_err(dev, "Missing '%s' IO resource\n", pname);
ret = -ENODEV;
goto err;
}
abb->base = devm_ioremap_resource(dev, res); abb->base = devm_ioremap_resource(dev, res);
if (IS_ERR(abb->base)) { if (IS_ERR(abb->base)) {
ret = PTR_ERR(abb->base); ret = PTR_ERR(abb->base);
...@@ -770,11 +765,6 @@ static int ti_abb_probe(struct platform_device *pdev) ...@@ -770,11 +765,6 @@ static int ti_abb_probe(struct platform_device *pdev)
pname = "ldo-address"; pname = "ldo-address";
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
if (!res) {
dev_dbg(dev, "Missing '%s' IO resource\n", pname);
ret = -ENODEV;
goto skip_opt;
}
abb->ldo_base = devm_ioremap_resource(dev, res); abb->ldo_base = devm_ioremap_resource(dev, res);
if (IS_ERR(abb->ldo_base)) { if (IS_ERR(abb->ldo_base)) {
ret = PTR_ERR(abb->ldo_base); ret = PTR_ERR(abb->ldo_base);
......
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