From patchwork Sat May 25 08:57:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hariprasad Kelam X-Patchwork-Id: 10960667 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF921933 for ; Sat, 25 May 2019 08:57:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD46328A16 for ; Sat, 25 May 2019 08:57:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D087D28A77; Sat, 25 May 2019 08:57:58 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,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 4C04128A16 for ; Sat, 25 May 2019 08:57:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726562AbfEYI55 (ORCPT ); Sat, 25 May 2019 04:57:57 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38413 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726461AbfEYI55 (ORCPT ); Sat, 25 May 2019 04:57:57 -0400 Received: by mail-pg1-f195.google.com with SMTP id v11so6351487pgl.5; Sat, 25 May 2019 01:57:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=h6CJNeJfwAGepu78xNvsTOU487N30UR9DpFDGMST21U=; b=XpCxCnFwOzDp3VcZX1o5V0FlLljMvB1oe0hW1xZcJhnrT6e8amg4l8ewlFYRILf2ZR Od7hQYRTsynjfzguryfqVKPWc4eFpdlue+oZxKlWK25hoXHcSBPxtNpPJQCI1xebbImt ZB5vM6JDt8PvKwuHa3JcoGSCclB4Qt6iNlE30C37aOO64CjqYsAWKvztCZkkDpAOqZZ1 H246X7hPwAsxJrmawBRjAPEba/SItvKXWbxngV7CPXJki5JHUbDzmI5MNFteEst0Qbr9 SRDbiS+CQs423SC8HY+Xjnn0A4XpvHgxALFpFUBM5zLDnlFh00XMoIrK1XLcl9N8wQWn ZGTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=h6CJNeJfwAGepu78xNvsTOU487N30UR9DpFDGMST21U=; b=OibhhVN2JjJ8XhD/0zbKb9Z5Ff7lCESyCiCPLWoE+E5xCW7b3pJquw8VRN9RuRWVcG 8to1zYRZvRyPvThBRtulf33tFPYgvsCtISnnd3iTv3pQLXOcbK93kcge3nmUysFZdraB ZeXn0FeBRP2n63893FN3rWzSXD6UClRn4ZDXjCvFsXNsgMf9TNEgGeyQIbSuwY0tXelw PbQyQ9nb8/e6wqsXkKWxWNfMWLxwdSyljkD7Cs7f6RLso4jHBV6nzQiI9hNUCalilssp 0C1lpsqhULTUJc4cMutmG0X7TuPnSe9tXS9tDPIs8sm2zsG8XYTk7RYMeoJc7ptD5Lmk UskA== X-Gm-Message-State: APjAAAVsUqBiGOEPViG7Ak2NIzTI08oZA09YyuDLsflMHf2SpcH4ZAHS geP6IXwKoZBbw8OavveFjSQ= X-Google-Smtp-Source: APXvYqwBnOPc5MegctYdFcVCQeHguaHsZC8pE6zpPcNGND4G4MHfDDnpxIIuEAeIgwwHpyIswt2CqA== X-Received: by 2002:a62:1483:: with SMTP id 125mr89353590pfu.137.1558774676547; Sat, 25 May 2019 01:57:56 -0700 (PDT) Received: from hari-Inspiron-1545 ([183.83.92.73]) by smtp.gmail.com with ESMTPSA id y13sm6946808pfb.143.2019.05.25.01.57.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 May 2019 01:57:55 -0700 (PDT) Date: Sat, 25 May 2019 14:27:48 +0530 From: Hariprasad Kelam To: ingoo Han , Lorenzo Pieralisi , Bjorn Helgaas , Kukjin Kim , Krzysztof Kozlowski , Yue Wang , Kevin Hilman , Xiaowei Song , Binghui Wang , Stanimir Varbanov , Andy Gross , David Brown , Thierry Reding , Jonathan Hunter , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH] drivers/pci/controller: fix warning PTR_ERR_OR_ZERO can be used Message-ID: <20190525085748.GA10926@hari-Inspiron-1545> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP fix below warnings reported by coccichek /drivers/pci/controller/pci-tegra.c:1132:1-3: WARNING: PTR_ERR_OR_ZERO can be used ./drivers/pci/controller/dwc/pcie-qcom.c:703:1-3: WARNING: PTR_ERR_OR_ZERO can be used ./drivers/pci/controller/dwc/pci-meson.c:185:1-3: WARNING: PTR_ERR_OR_ZERO can be used ./drivers/pci/controller/dwc/pci-meson.c:262:1-3: WARNING: PTR_ERR_OR_ZERO can be used ./drivers/pci/controller/dwc/pcie-kirin.c:141:1-3: WARNING: PTR_ERR_OR_ZERO can be used ./drivers/pci/controller/dwc/pcie-kirin.c:177:1-3: WARNING: PTR_ERR_OR_ZERO can be used ./drivers/pci/controller/dwc/pci-exynos.c:95:1-3: WARNING: PTR_ERR_OR_ZERO can be used Signed-off-by: Hariprasad Kelam --- drivers/pci/controller/dwc/pci-exynos.c | 4 +--- drivers/pci/controller/dwc/pci-meson.c | 8 ++------ drivers/pci/controller/dwc/pcie-kirin.c | 8 ++------ drivers/pci/controller/dwc/pcie-qcom.c | 4 +--- drivers/pci/controller/pci-tegra.c | 4 +--- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c index cee5f2f..b0b4849 100644 --- a/drivers/pci/controller/dwc/pci-exynos.c +++ b/drivers/pci/controller/dwc/pci-exynos.c @@ -92,10 +92,8 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev, res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ep->mem_res->elbi_base = devm_ioremap_resource(dev, res); - if (IS_ERR(ep->mem_res->elbi_base)) - return PTR_ERR(ep->mem_res->elbi_base); - return 0; + return PTR_ERR_OR_ZERO(ep->mem_res->elbi_base); } static int exynos5440_pcie_get_clk_resources(struct exynos_pcie *ep) diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c index e35e9ea..1ca78c2 100644 --- a/drivers/pci/controller/dwc/pci-meson.c +++ b/drivers/pci/controller/dwc/pci-meson.c @@ -182,10 +182,8 @@ static int meson_pcie_get_mems(struct platform_device *pdev, /* Meson SoC has two PCI controllers use same phy register*/ mp->mem_res.phy_base = meson_pcie_get_mem_shared(pdev, mp, "phy"); - if (IS_ERR(mp->mem_res.phy_base)) - return PTR_ERR(mp->mem_res.phy_base); - return 0; + return PTR_ERR_OR_ZERO(mp->mem_res.phy_base); } static void meson_pcie_power_on(struct meson_pcie *mp) @@ -259,10 +257,8 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp) return PTR_ERR(res->general_clk); res->clk = meson_pcie_probe_clock(dev, "pcie", 0); - if (IS_ERR(res->clk)) - return PTR_ERR(res->clk); - return 0; + return PTR_ERR_OR_ZERO(res->clk); } static inline void meson_elb_writel(struct meson_pcie *mp, u32 val, u32 reg) diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c index 9b59929..87cfdb4 100644 --- a/drivers/pci/controller/dwc/pcie-kirin.c +++ b/drivers/pci/controller/dwc/pcie-kirin.c @@ -138,10 +138,8 @@ static long kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie, return PTR_ERR(kirin_pcie->apb_sys_clk); kirin_pcie->pcie_aclk = devm_clk_get(dev, "pcie_aclk"); - if (IS_ERR(kirin_pcie->pcie_aclk)) - return PTR_ERR(kirin_pcie->pcie_aclk); - return 0; + return PTR_ERR_OR_ZERO(kirin_pcie->pcie_aclk); } static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie, @@ -174,10 +172,8 @@ static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie, kirin_pcie->sysctrl = syscon_regmap_lookup_by_compatible("hisilicon,hi3660-sctrl"); - if (IS_ERR(kirin_pcie->sysctrl)) - return PTR_ERR(kirin_pcie->sysctrl); - return 0; + return PTR_ERR_OR_ZERO(kirin_pcie->sysctrl); } static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 0ed235d..6c421e6 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -700,10 +700,8 @@ static int qcom_pcie_get_resources_2_4_0(struct qcom_pcie *pcie) return PTR_ERR(res->ahb_reset); res->phy_ahb_reset = devm_reset_control_get_exclusive(dev, "phy_ahb"); - if (IS_ERR(res->phy_ahb_reset)) - return PTR_ERR(res->phy_ahb_reset); - return 0; + return PTR_ERR_OR_ZERO(res->phy_ahb_reset); } static void qcom_pcie_deinit_2_4_0(struct qcom_pcie *pcie) diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c index 464ba25..3cd5069 100644 --- a/drivers/pci/controller/pci-tegra.c +++ b/drivers/pci/controller/pci-tegra.c @@ -1129,10 +1129,8 @@ static int tegra_pcie_resets_get(struct tegra_pcie *pcie) return PTR_ERR(pcie->afi_rst); pcie->pcie_xrst = devm_reset_control_get_exclusive(dev, "pcie_x"); - if (IS_ERR(pcie->pcie_xrst)) - return PTR_ERR(pcie->pcie_xrst); - return 0; + return PTR_ERR_OR_ZERO(pcie->pcie_xrst); } static int tegra_pcie_phys_get_legacy(struct tegra_pcie *pcie)