| Message ID | 1467806612-23904-1-git-send-email-weiyj_lk@163.com |
|---|---|
| State | New |
| Headers | show |
Hello Wei, Thank you for the patch. On Wednesday 06 Jul 2016 12:03:32 weiyj_lk@163.com wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR. > > Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/pinctrl/sh-pfc/pinctrl.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c > b/drivers/pinctrl/sh-pfc/pinctrl.c index d4e65bc..e208ee0 100644 > --- a/drivers/pinctrl/sh-pfc/pinctrl.c > +++ b/drivers/pinctrl/sh-pfc/pinctrl.c > @@ -814,8 +814,5 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) > pmx->pctl_desc.npins = pfc->info->nr_pins; > > pmx->pctl = devm_pinctrl_register(pfc->dev, &pmx->pctl_desc, pmx); > - if (IS_ERR(pmx->pctl)) > - return PTR_ERR(pmx->pctl); > - > - return 0; > + return PTR_ERR_OR_ZERO(pmx->pctl); > }
On Wed, Jul 6, 2016 at 2:03 PM, <weiyj_lk@163.com> wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR. > > Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Patch applied with Laurent's ACK. (Not expecting Geert to collect patches for me this late in the merge cycle.) 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/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c index d4e65bc..e208ee0 100644 --- a/drivers/pinctrl/sh-pfc/pinctrl.c +++ b/drivers/pinctrl/sh-pfc/pinctrl.c @@ -814,8 +814,5 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) pmx->pctl_desc.npins = pfc->info->nr_pins; pmx->pctl = devm_pinctrl_register(pfc->dev, &pmx->pctl_desc, pmx); - if (IS_ERR(pmx->pctl)) - return PTR_ERR(pmx->pctl); - - return 0; + return PTR_ERR_OR_ZERO(pmx->pctl); }