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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 6ED7CC433EF for ; Sun, 8 Sep 2019 12:59:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45A0720693 for ; Sun, 8 Sep 2019 12:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947555; bh=HNtAo6suQtfGvCkYmB3ViuLyFeRqmPGB5i7Q0TdwHjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gb4qmWNHvUMzuo9Nznskv3xw8CTWemZiK98RK3KO86XoiLtSengkF9t+NrSW8nSsZ qZ8l8OYF+XGJG8LWBNZB1k0l6PIaxHw5KWX56PoW11kGbIVGMNTDNY1cbDUoGw9ITw yP/aAbApxrvxk4cZiUjeXm8Js6RehfkQObTAgAQ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730334AbfIHMqR (ORCPT ); Sun, 8 Sep 2019 08:46:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:33860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730330AbfIHMqR (ORCPT ); Sun, 8 Sep 2019 08:46:17 -0400 Received: from localhost (unknown [62.28.240.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3EE4020644; Sun, 8 Sep 2019 12:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946776; bh=HNtAo6suQtfGvCkYmB3ViuLyFeRqmPGB5i7Q0TdwHjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fG1LgaszzxJFKgdSRU26naR08NY1apkXvzYZyCAnFaDW+L/z2UztJA4cjf/+OdMmi +fsy218c003YJJz1M9ZVl5TcpOzEjjBA3SoYQ5NiaxlpAJTtTSlAXSgKR/TKYkECId U54q7mNBnRuyibz5yARD2cU+QAnc2ayrteu0LFjY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chen-Yu Tsai , "David S. Miller" Subject: [PATCH 4.14 35/40] net: stmmac: dwmac-rk: Dont fail if phy regulator is absent Date: Sun, 8 Sep 2019 13:42:08 +0100 Message-Id: <20190908121129.901030610@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121114.260662089@linuxfoundation.org> References: <20190908121114.260662089@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chen-Yu Tsai [ Upstream commit 3b25528e1e355c803e73aa326ce657b5606cda73 ] The devicetree binding lists the phy phy as optional. As such, the driver should not bail out if it can't find a regulator. Instead it should just skip the remaining regulator related code and continue on normally. Skip the remainder of phy_power_on() if a regulator supply isn't available. This also gets rid of the bogus return code. Fixes: 2e12f536635f ("net: stmmac: dwmac-rk: Use standard devicetree property for phy regulator") Signed-off-by: Chen-Yu Tsai Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1145,10 +1145,8 @@ static int phy_power_on(struct rk_priv_d int ret; struct device *dev = &bsp_priv->pdev->dev; - if (!ldo) { - dev_err(dev, "no regulator found\n"); - return -1; - } + if (!ldo) + return 0; if (enable) { ret = regulator_enable(ldo);