aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-07-12 10:19:45 -0400
committerLinus Walleij <linus.walleij@linaro.org>2016-07-22 10:37:25 -0400
commit8bf0bd4173f256278894cf709fc02c184b85640c (patch)
treee09a83c3f81e03c4171b2548b513f61fc597ffde
parent25af8bfa9693358b0b1e626bee8c95300451ca71 (diff)
pinctrl: ns2: remove redundant dev_err call in ns2_pinmux_probe()
There is a error message within devm_ioremap_resource already, so remove the dev_err call to avoid redundant error message. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Ray Jui <ray.jui@broadcom.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/bcm/pinctrl-ns2-mux.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-ns2-mux.c b/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
index 7e5f7b7bf4d5..ca817896ed24 100644
--- a/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
+++ b/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
@@ -1044,10 +1044,8 @@ static int ns2_pinmux_probe(struct platform_device *pdev)
1044 1044
1045 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1045 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1046 pinctrl->base0 = devm_ioremap_resource(&pdev->dev, res); 1046 pinctrl->base0 = devm_ioremap_resource(&pdev->dev, res);
1047 if (IS_ERR(pinctrl->base0)) { 1047 if (IS_ERR(pinctrl->base0))
1048 dev_err(&pdev->dev, "unable to map I/O space\n");
1049 return PTR_ERR(pinctrl->base0); 1048 return PTR_ERR(pinctrl->base0);
1050 }
1051 1049
1052 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 1050 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
1053 pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start, 1051 pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,
@@ -1059,10 +1057,8 @@ static int ns2_pinmux_probe(struct platform_device *pdev)
1059 1057
1060 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); 1058 res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
1061 pinctrl->pinconf_base = devm_ioremap_resource(&pdev->dev, res); 1059 pinctrl->pinconf_base = devm_ioremap_resource(&pdev->dev, res);
1062 if (IS_ERR(pinctrl->pinconf_base)) { 1060 if (IS_ERR(pinctrl->pinconf_base))
1063 dev_err(&pdev->dev, "unable to map I/O space\n");
1064 return PTR_ERR(pinctrl->pinconf_base); 1061 return PTR_ERR(pinctrl->pinconf_base);
1065 }
1066 1062
1067 ret = ns2_mux_log_init(pinctrl); 1063 ret = ns2_mux_log_init(pinctrl);
1068 if (ret) { 1064 if (ret) {