From patchwork Wed Jul 6 12:03:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weiyj_lk@163.com X-Patchwork-Id: 9216259 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7596360467 for ; Wed, 6 Jul 2016 12:04:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65F4628818 for ; Wed, 6 Jul 2016 12:04:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A84228877; Wed, 6 Jul 2016 12:04:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E17AE28818 for ; Wed, 6 Jul 2016 12:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754082AbcGFMEX (ORCPT ); Wed, 6 Jul 2016 08:04:23 -0400 Received: from m12-16.163.com ([220.181.12.16]:43948 "EHLO m12-16.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753826AbcGFMEW (ORCPT ); Wed, 6 Jul 2016 08:04:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=E2rVO 9zmNnsvt848t9VEntYAg4Ndpjxw51+MqpY3o3E=; b=Vvfew2tH/3os639hcGQfI Tr+B+n/Kig43RPD+vdgjh8AqZbbV78ZyflFYh0BEX9dUMdlDFu3+fcP7HBqOQSFv LtpONoPF4Rn9n+TKDdjL9itnuvJrce5z18oV2cyCtx7ZnNDK9ZZGfsurCZcgI0Ts 7Lo096QW2XV0GiVNat2VGw= Received: from localhost.localdomain.localdomain (unknown [49.77.207.185]) by smtp12 (Coremail) with SMTP id EMCowABHT1eU83xXAKOHAw--.40793S2; Wed, 06 Jul 2016 20:03:33 +0800 (CST) From: weiyj_lk@163.com To: Laurent Pinchart , Geert Uytterhoeven , Linus Walleij Cc: Wei Yongjun , linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org Subject: [PATCH -next] sh-pfc: Use PTR_ERR_OR_ZERO() to simplify the code Date: Wed, 6 Jul 2016 12:03:32 +0000 Message-Id: <1467806612-23904-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CM-TRANSID: EMCowABHT1eU83xXAKOHAw--.40793S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7WryUCw4ktrW5Ar4xZF48tFb_yoW3ZwbEga y5ur9Fyry3GFWIgr48Kr4rZasYvF4DXr4FqF1vgayfC347Jw4rJr95urn8Gw1kGw1rt3s7 G3yvqFyFyrWrAjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnBnmtUUUUU== X-Originating-IP: [49.77.207.185] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiGRWe1lXlTu8AbwAAs6 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR. Signed-off-by: Wei Yongjun Acked-by: Laurent Pinchart --- 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); }