From patchwork Mon Jan 13 21:07:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 11330897 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 702E56C1 for ; Mon, 13 Jan 2020 21:08:47 +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 4700724655 for ; Mon, 13 Jan 2020 21:08:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JNeLXQ8W"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TvNq4fxI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4700724655 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+patchwork-linux-arm=patchwork.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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=0+1jAuHB7GdFcsD/e81gwFFizUMbAM3scx+m1Sdqfyc=; b=JNeLXQ8WnAIhAQUhVfXgnOrF0S oVMMvlt6LqyC1Hs3atfGOf7IaI/8UlubJHoUOQX1PnAuAwcKYZOPFfXJvcvWW2vR2eF9Sz66gY8+7 lix7ab/XlvOf5WAMWB0D4sQCovHO10dAHkUFq8HByIreNYTITGiZh3iOLWKgaKb1vxnG2FHcNfbHL +HW+k8jpNROsvXC+88ysiuW+FjzfZPOzoCPLiG4S2b2iiqZUUpqZfahTKrB1BrqnFPNiQGsjPNmz0 XirRtlQIeuHkH33C0vubK/vOIDFQVpJagn+mvahW/vFNMi9kSRKADp3dKKp1oj9Rm6YUrJ3iRi0hA avVauXNg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ir6x3-0007nN-Av; Mon, 13 Jan 2020 21:08:45 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ir6wG-00070o-4a for linux-arm-kernel@lists.infradead.org; Mon, 13 Jan 2020 21:07:57 +0000 Received: by mail-pf1-x444.google.com with SMTP id x185so5468470pfc.5 for ; Mon, 13 Jan 2020 13:07:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=c4EwOwGyRZn732m62F/bmkLNPBHupsvQnM8EZTJTEOU=; b=TvNq4fxIGcMuRSTocpaToEWweIJ2INFcSGkfkTb2PGFYP4PexLnpNWn0jgZYGYkBrv VcgNEUh9ux0x752QjnvpckLrBNTTBhvRbXKtk3vwZq8JrI/K3L+8JDPweSfGXHyj/NDp SvdW6n05jJp7R3pUNZSHm0PkJ2hw1hb2HhRkTO/XwdTOK6H3f1xhiznskz7KsLuroa/l 9xL/gQ8ciwMwcwuf7vlBvbai/qoolqJVhLzDwQXYFaAQUJloAe5eBq1QOfzWp/0ZmigB FnOcocIKY7rYAWBeSySjqqTjLIRtFhGBdyrIyskrV6zXFmRPVx0TZeQbIzuOaZttRLWi WKRA== 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:in-reply-to :references; bh=c4EwOwGyRZn732m62F/bmkLNPBHupsvQnM8EZTJTEOU=; b=pqJTWj4fLwqNtASSWBz44CrTF3+E/DommHLABe+3f1R8juM7Z8kzpDk5gpzeoLXwFp WvhBWUdw7cR+71O/zt1z3kORnNjhQpy2cyF9cvpruS+xnPlcef0PKiZWnIQBho8F85TS xrsQO/xDndX+vn6x1oMW6PWOPtKKg612e1yGirdH5ykcc0qcvMwhfOJMlTyjKfn3MrCk /v+Yc2TTvQfY9XR3S8fMQWg6ZNiv1xrSkoxnTEnR36v+qXelCSnh6VvB7IdTkSUeflCI SVSxIPH6pJjWG92fk7dz32Z6B1b1nbC+gDDfA+Vxo7h/zGHxLighwT6QjD/gnD685oLb xXnw== X-Gm-Message-State: APjAAAU1UXOr1AAXnngoTlj/Kmz0nFxY3tmuyZihdfZJjTMenoWOxnbE AZHG9AxPBSGdxGGAQiIDjf0= X-Google-Smtp-Source: APXvYqx1R7S8pIV0K8TV9qoZ4dBSE0XGBn6qp4kgOM11WVqKY4FU4nvS/xhY19oqkjyQfl1iY2QsUg== X-Received: by 2002:a63:a43:: with SMTP id z3mr22981828pgk.232.1578949674958; Mon, 13 Jan 2020 13:07:54 -0800 (PST) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id s1sm14195827pgv.87.2020.01.13.13.07.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2020 13:07:54 -0800 (PST) From: Al Cooper To: linux-kernel@vger.kernel.org Subject: [PATCH 3/6] mmc: sdhci-brcmstb: Fix driver to defer on clk_get defer Date: Mon, 13 Jan 2020 16:07:03 -0500 Message-Id: <20200113210706.11972-4-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200113210706.11972-1-alcooperx@gmail.com> References: <20200113210706.11972-1-alcooperx@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200113_130756_205879_3286243E X-CRM114-Status: GOOD ( 13.48 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (alcooperx[at]gmail.com) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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: Mark Rutland , devicetree@vger.kernel.org, Ulf Hansson , Florian Fainelli , Takao Orito , Andrew Jeffery , YueHaibing , Al Cooper , linux-mmc@vger.kernel.org, Adrian Hunter , Rob Herring , Faiz Abbas , bcm-kernel-feedback-list@broadcom.com, Manivannan Sadhasivam , Sowjanya Komatineni , "Enrico Weigelt, metux IT consult" , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The new SCMI clock protocol driver does not get probed that early in boot. Brcmstb drivers typically have the following code when getting a clock: priv->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk)) { dev_err(&pdev->dev, "Clock not found in Device Tree\n"); priv->clk = NULL; } This commit changes the driver to do what is below. priv->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk)) { if (PTR_ERR(priv->clk) == -EPROBE_DEFER) return -EPROBE_DEFER; dev_err(&pdev->dev, "Clock not found in Device Tree\n"); priv->clk = NULL; } Signed-off-by: Al Cooper --- drivers/mmc/host/sdhci-brcmstb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c index daa89ca232a2..218176b79b6a 100644 --- a/drivers/mmc/host/sdhci-brcmstb.c +++ b/drivers/mmc/host/sdhci-brcmstb.c @@ -91,6 +91,8 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) { + if (PTR_ERR(clk) == -EPROBE_DEFER) + return -EPROBE_DEFER; dev_err(&pdev->dev, "Clock not found in Device Tree\n"); clk = NULL; }