From nobody Sat May 10 06:13:17 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1612272736; cv=none; d=zohomail.com; s=zohoarc; b=UEj1y15JHZf28OL0FARTdH650/mxk+o/HDA2AIGJhgYwnnjgqp6VhU+9i8SbCFUIBMiTq62/RCxEvEzCiiHtmm80f4yFQN2LMen0Pbb0avAEYhDRo5ULRoE0NgZuOWntUBV3R1mWyytW3HKNFwb0edMCreFq3P/CnIRA7QlqpqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612272736; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wpfNkYjLZE29ihYTOO7gV0Kf6yc5u5ZeOlvU7eQN6Jc=; b=Q7i/zJ4yKr0sS1Ct0EjYN8m6yYNHzHb57JyY3b92ltBcJFUSjHdqKoSVf4pNZsr7Oyyh1FSIGT5wMy5o3JMiHspxL/zPfoAlMEQ6/wiyoxV2r/sCBi9u3W5WVnHwptRKMpOiJ0uoXejzEtX56DAPm1ibElh2uSwmFrVdPFxXMok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1612272736129295.6295086520947; Tue, 2 Feb 2021 05:32:16 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232392AbhBBNbu (ORCPT ); Tue, 2 Feb 2021 08:31:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:59340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231667AbhBBNan (ORCPT ); Tue, 2 Feb 2021 08:30:43 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CD8AF64F5E; Tue, 2 Feb 2021 13:30:01 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1l6vkl-0011yx-Lg; Tue, 02 Feb 2021 14:29:59 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612272602; bh=4gFTxbD8NGyOTtlIIHu+xGitdIxhXiStTHAdYZ5nKqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sGXwZfzTvBnJHo9rS+xLZejT5Gkiqa9j0iAdqH7VYxTgJ1qV35K99pSAH7PJYVQk2 I66ShXK9ezA3B67CndWUOLRRyeAmUhSNeqWS3jujnlGoF+GXLpSaX1ZvpFHaocl+nW d8U2uBoCefUwJL9xbEK4oWSLH/je8qSNoyHoi20IuM5Hvw1LUeqc0r6SIBxMpK1ZsM bwAZXeG7mR6HUBUru2QLy8GcCdascsc2BxoyPLzNdtuc/v1fvW2tCsDQMBa/WGmril tWtaUSNDyAT7MrdCzlM0zXMZksVycBU4WI9E8TRHqDhJ/ZZoWuV2/eJ4/8ZQXUrYsa 2I8gqJIvnv99w== From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Binghui Wang , Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , Xiaowei Song , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH 06/13] pci: dwc: pcie-kirin: simplify error handling logic Date: Tue, 2 Feb 2021 14:29:51 +0100 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Instead of returning -ENODEV when of_get_named_gpio() fails, make it return the actual error code. With that, there's no need anymore to check for -EPROBE_DEFER at kirin_pcie_probe(). Signed-off-by: Mauro Carvalho Chehab --- drivers/pci/controller/dwc/pcie-kirin.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controll= er/dwc/pcie-kirin.c index 5925d2b345a8..f46a51ffd2c8 100644 --- a/drivers/pci/controller/dwc/pcie-kirin.c +++ b/drivers/pci/controller/dwc/pcie-kirin.c @@ -320,7 +320,7 @@ static long kirin960_pcie_get_resource(struct kirin_pci= e *kirin_pcie, kirin_pcie->gpio_id_reset[0] =3D of_get_named_gpio(dev->of_node, "reset-gpios", 0); if (kirin_pcie->gpio_id_reset[0] < 0) - return -ENODEV; + return kirin_pcie->gpio_id_reset[0]; =20 return 0; } @@ -354,22 +354,22 @@ static long kirin970_pcie_get_resource(struct kirin_p= cie *kirin_pcie, kirin_pcie->gpio_id_reset[0] =3D of_get_named_gpio(dev->of_node, "switch,reset-gpios", 0); if (kirin_pcie->gpio_id_reset[0] < 0) - return -ENODEV; + return kirin_pcie->gpio_id_reset[0]; =20 kirin_pcie->gpio_id_reset[1] =3D of_get_named_gpio(dev->of_node, "eth,reset-gpios", 0); if (kirin_pcie->gpio_id_reset[1] < 0) - return -ENODEV; + return kirin_pcie->gpio_id_reset[1]; =20 kirin_pcie->gpio_id_reset[2] =3D of_get_named_gpio(dev->of_node, "m_2,reset-gpios", 0); if (kirin_pcie->gpio_id_reset[2] < 0) - return -ENODEV; + return kirin_pcie->gpio_id_reset[2]; =20 kirin_pcie->gpio_id_reset[3] =3D of_get_named_gpio(dev->of_node, "mini1,reset-gpios", 0); if (kirin_pcie->gpio_id_reset[3] < 0) - return -ENODEV; + return kirin_pcie->gpio_id_reset[3]; =20 ret =3D devm_gpio_request(dev, kirin_pcie->gpio_id_reset[0], "pcie_switch_reset"); @@ -1148,11 +1148,7 @@ static int kirin_pcie_probe(struct platform_device *= pdev) if (ret) return ret; =20 - kirin_pcie->gpio_id_reset[0] =3D of_get_named_gpio(dev->of_node, - "reset-gpios", 0); - if (kirin_pcie->gpio_id_reset[0] =3D=3D -EPROBE_DEFER) { - return -EPROBE_DEFER; - } else if (!gpio_is_valid(kirin_pcie->gpio_id_reset[0])) { + if (!gpio_is_valid(kirin_pcie->gpio_id_reset[0])) { dev_err(dev, "unable to get a valid gpio pin\n"); return -ENODEV; } --=20 2.29.2