From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C6E6C3A5A1 for ; Wed, 28 Aug 2019 15:07:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2E86C2080F for ; Wed, 28 Aug 2019 15:07:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tBXEZadx"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="G4yuIL9a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E86C2080F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=me4KOUuIm8u6PWCTqhtJvL6w9kSwp8dRwoliawL1I7w=; b=tBXEZadxsMkV2S N4lVqefi3MpwIXw+5yEN4GKxzPstbQtR14x9YJQXLbScdORRRnem5fbTPIHhYZQlhmuPQeNPvUdbZ ZpzcD7h9GDeSMY9WQfZSYVJ/uqfNbLM8GDj11HZ06H3NE5zsCs+x3prNam2tMgz2wsZcQGsVsXLys zBfWGbTfig/3oyM+GPMI4ldEApieNcJbbEYQ3CrtanNQG0eTpBUm67pS75Ggeakg946A51Rh26efV Z7lRRSpXX3L2eALW/oABIxkySdGEYwV9mDFhP2CC+c9hOyzz7vwIVYdhYKZChT0rjSXj+EDsQy+bf CgNaj2dD+TGCSMfqQ6gw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i2zY7-0004Pw-6P; Wed, 28 Aug 2019 15:07:51 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i2zY0-0004O8-6n; Wed, 28 Aug 2019 15:07:45 +0000 Received: by mail-wm1-x344.google.com with SMTP id t6so422591wmj.4; Wed, 28 Aug 2019 08:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0g6/GWz5P/gWnoS2zvVct0hdhKaGG9FVra9wvXgtYro=; b=G4yuIL9aACyk+T1kP/v/gjWwqvfosJhV/CrOwvCZWPq9LWrgypos/FB/at6623Os0t MOjMC5p8GDAvrCudo/Voigjzi7LGwqvDvmptJA2N/SJb9rzz8l1OWLHyPaqkWWcUGFex aFbl21PTj2DpaTmDZxsWCQjknQ/v/A64x+9/I1RBG3ySsddEYNFul/ZMysk6C1zIEDz2 MBRhkBBi6OTf8+IF1x3Yqfpd1ba9BTNHpuLTo4c6l2c6OM/5/CgsdXZXizmAgTS9lc1G OUcRyNcj3Ue1IAA6TzU/T+ka6LERlX/TAPj5w547tGTGFhy+L711EsFj3W5yPt8ZSB+p Tmqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0g6/GWz5P/gWnoS2zvVct0hdhKaGG9FVra9wvXgtYro=; b=DzOrRoynW9Z5yc2ceQPnSTf3bFCK7u8XHN0sD/VnuXDvl/AB8CFB/XPiyHLCp5gy7o 0mbQjW2KlfO0+j5rcQ9mr6qp90vdwELymc8T/P/jGvwHa9sTZaz3uaV46qoAZj7BOP7E yhMrrHa6N4bhYP4h1eN+YoZu+7uhby8oiUvd4UyWwdY2kIOcmJKf+FabmQTktJwZGdgu 6WaHprr3ylU2iEWYxzBzO0np3mQALang+LYRjB8DWiyY3wf51mieLKiKltxtQv/hRxJ8 8ILHB+UgQyhl/r1+dRfsO7B6+4EfwtzbtPjL+P+qAWu/YZm7jsbUsycWBuU/xOurY3/9 4SNQ== X-Gm-Message-State: APjAAAUTzSxHDKTot7dMJvbHZ/5qUB21TfWrnuMcwbNYX1qmow+JhO0m ehoEPx0ThvydQuf/4C5uOcY= X-Google-Smtp-Source: APXvYqzpBqySxGG2yCcwTNpgYDuAfZBmGQmktNF+X+q9cdeGc6c9u/8Edr1Xpqs95F0MjOE+3g8WCA== X-Received: by 2002:a1c:d108:: with SMTP id i8mr5824675wmg.28.1567004860039; Wed, 28 Aug 2019 08:07:40 -0700 (PDT) Received: from localhost (pD9E51890.dip0.t-ipconnect.de. [217.229.24.144]) by smtp.gmail.com with ESMTPSA id v124sm3115316wmf.23.2019.08.28.08.07.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 08:07:38 -0700 (PDT) From: Thierry Reding To: Lorenzo Pieralisi , Bjorn Helgaas , Shawn Lin Subject: [PATCH] PCI: rockchip: Properly handle optional regulators Date: Wed, 28 Aug 2019 17:07:37 +0200 Message-Id: <20190828150737.30285-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190828_080744_255877_A16F7427 X-CRM114-Status: GOOD ( 11.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , linux-pci@vger.kernel.org, Vidya Sagar , linux-rockchip@lists.infradead.org, Andrew Murray , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Thierry Reding regulator_get_optional() can fail for a number of reasons besides probe deferral. It can for example return -ENOMEM if it runs out of memory as it tries to allocate data structures. Propagating only -EPROBE_DEFER is problematic because it results in these legitimately fatal errors being treated as "regulator not specified in DT". What we really want is to ignore the optional regulators only if they have not been specified in DT. regulator_get_optional() returns -ENODEV in this case, so that's the special case that we need to handle. So we propagate all errors, except -ENODEV, so that real failures will still cause the driver to fail probe. Signed-off-by: Thierry Reding --- drivers/pci/controller/pcie-rockchip-host.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c index 8d20f1793a61..ef8e677ce9d1 100644 --- a/drivers/pci/controller/pcie-rockchip-host.c +++ b/drivers/pci/controller/pcie-rockchip-host.c @@ -608,29 +608,29 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip) rockchip->vpcie12v = devm_regulator_get_optional(dev, "vpcie12v"); if (IS_ERR(rockchip->vpcie12v)) { - if (PTR_ERR(rockchip->vpcie12v) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (PTR_ERR(rockchip->vpcie12v) != -ENODEV) + return PTR_ERR(rockchip->vpcie12v); dev_info(dev, "no vpcie12v regulator found\n"); } rockchip->vpcie3v3 = devm_regulator_get_optional(dev, "vpcie3v3"); if (IS_ERR(rockchip->vpcie3v3)) { - if (PTR_ERR(rockchip->vpcie3v3) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (PTR_ERR(rockchip->vpcie3v3) != -ENODEV) + return PTR_ERR(rockchip->vpcie3v3); dev_info(dev, "no vpcie3v3 regulator found\n"); } rockchip->vpcie1v8 = devm_regulator_get_optional(dev, "vpcie1v8"); if (IS_ERR(rockchip->vpcie1v8)) { - if (PTR_ERR(rockchip->vpcie1v8) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (PTR_ERR(rockchip->vpcie1v8) != -ENODEV) + return PTR_ERR(rockchip->vpcie1v8); dev_info(dev, "no vpcie1v8 regulator found\n"); } rockchip->vpcie0v9 = devm_regulator_get_optional(dev, "vpcie0v9"); if (IS_ERR(rockchip->vpcie0v9)) { - if (PTR_ERR(rockchip->vpcie0v9) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (PTR_ERR(rockchip->vpcie0v9) != -ENODEV) + return PTR_ERR(rockchip->vpcie0v9); dev_info(dev, "no vpcie0v9 regulator found\n"); } -- 2.22.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel