Message ID | 1467806571-23811-1-git-send-email-weiyj_lk@163.com |
---|---|
State | New |
Headers | show |
Hi Wei, On 7/6/2016 5:02 AM, weiyj_lk@163.com wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > 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> > --- > drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c > index 7df0880b..4149db3 100644 > --- a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c > +++ b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c > @@ -573,10 +573,8 @@ static int nsp_pinmux_probe(struct platform_device *pdev) > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > pinctrl->base0 = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(pinctrl->base0)) { > - dev_err(&pdev->dev, "unable to map I/O space\n"); > + if (IS_ERR(pinctrl->base0)) > return PTR_ERR(pinctrl->base0); > - } > > res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start, > @@ -588,10 +586,8 @@ static int nsp_pinmux_probe(struct platform_device *pdev) > > res = platform_get_resource(pdev, IORESOURCE_MEM, 2); > pinctrl->base2 = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(pinctrl->base2)) { > - dev_err(&pdev->dev, "unable to map I/O space\n"); > + if (IS_ERR(pinctrl->base2)) > return PTR_ERR(pinctrl->base2); > - } > > ret = nsp_mux_log_init(pinctrl); > if (ret) { > > > > Looks good to me. Thanks! Acked-by: Ray Jui <ray.jui@broadcom.com> -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jul 6, 2016 at 2:02 PM, <weiyj_lk@163.com> wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > 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> Patch applied with Ray's ACK. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c index 7df0880b..4149db3 100644 --- a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c +++ b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c @@ -573,10 +573,8 @@ static int nsp_pinmux_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); pinctrl->base0 = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(pinctrl->base0)) { - dev_err(&pdev->dev, "unable to map I/O space\n"); + if (IS_ERR(pinctrl->base0)) return PTR_ERR(pinctrl->base0); - } res = platform_get_resource(pdev, IORESOURCE_MEM, 1); pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start, @@ -588,10 +586,8 @@ static int nsp_pinmux_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 2); pinctrl->base2 = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(pinctrl->base2)) { - dev_err(&pdev->dev, "unable to map I/O space\n"); + if (IS_ERR(pinctrl->base2)) return PTR_ERR(pinctrl->base2); - } ret = nsp_mux_log_init(pinctrl); if (ret) {