diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:22 -0400 |
commit | 2d31b15b868b5369eb326464e6634ea5afba7a44 (patch) | |
tree | 5cc331e0a27824b3315b9ee522429c898b7d41c2 /drivers/regulator | |
parent | 04fcec88cdd050ae1cecf7cc7fabf50bd48b8cba (diff) | |
parent | cf06cbb9a08d70e4a69f0ce7962df6bcf7405eae (diff) |
Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/ti-abb-regulator.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c index 3753ed05e719..d8e3e1262bc2 100644 --- a/drivers/regulator/ti-abb-regulator.c +++ b/drivers/regulator/ti-abb-regulator.c | |||
@@ -717,11 +717,6 @@ static int ti_abb_probe(struct platform_device *pdev) | |||
717 | /* Map ABB resources */ | 717 | /* Map ABB resources */ |
718 | pname = "base-address"; | 718 | pname = "base-address"; |
719 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname); | 719 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname); |
720 | if (!res) { | ||
721 | dev_err(dev, "Missing '%s' IO resource\n", pname); | ||
722 | ret = -ENODEV; | ||
723 | goto err; | ||
724 | } | ||
725 | abb->base = devm_ioremap_resource(dev, res); | 720 | abb->base = devm_ioremap_resource(dev, res); |
726 | if (IS_ERR(abb->base)) { | 721 | if (IS_ERR(abb->base)) { |
727 | ret = PTR_ERR(abb->base); | 722 | ret = PTR_ERR(abb->base); |
@@ -770,11 +765,6 @@ static int ti_abb_probe(struct platform_device *pdev) | |||
770 | 765 | ||
771 | pname = "ldo-address"; | 766 | pname = "ldo-address"; |
772 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname); | 767 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname); |
773 | if (!res) { | ||
774 | dev_dbg(dev, "Missing '%s' IO resource\n", pname); | ||
775 | ret = -ENODEV; | ||
776 | goto skip_opt; | ||
777 | } | ||
778 | abb->ldo_base = devm_ioremap_resource(dev, res); | 768 | abb->ldo_base = devm_ioremap_resource(dev, res); |
779 | if (IS_ERR(abb->ldo_base)) { | 769 | if (IS_ERR(abb->ldo_base)) { |
780 | ret = PTR_ERR(abb->ldo_base); | 770 | ret = PTR_ERR(abb->ldo_base); |