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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 BAB9CC3A5A8 for ; Wed, 4 Sep 2019 16:05:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 85DC32070C for ; Wed, 4 Sep 2019 16:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567613103; bh=Z5yZRVoMnplf/9atXWN8kDvOi61gsFOJRect1a7BN9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DkI7xVPD4FgUtbDaZHwyMuBe4CyHRmZhQEDFXnRtbq5dP3r7MBum7oRIDBK4YLMyS PS0A6t6vnq14B6yot6e+yZGgAd8I+O0HzkGhviweYnUZnpcfwjJlDPPgT7FbPB73pS 6o6QlU9DWdq2b5TVnmSmtiZRb07bETOXUNP0XpOc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387557AbfIDQDA (ORCPT ); Wed, 4 Sep 2019 12:03:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:39252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387514AbfIDQC6 (ORCPT ); Wed, 4 Sep 2019 12:02:58 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F27D2087E; Wed, 4 Sep 2019 16:02:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612977; bh=Z5yZRVoMnplf/9atXWN8kDvOi61gsFOJRect1a7BN9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x2whNa+91Eyh+ud3cY/5iaFXiEPaoxvtd+UtRY6hfCQD2RfZfMqWrXebGrpM4d4rQ hzVDOSo8mISPItAcKOLCeCH/hBF5j5cIAw7kWSaGLyPNLWoawRFRsjkGZxhIYsAWEi N10dKs3Q7R//jQq8lgT3aDRmMZZGp+VoLWifKm/o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chen-Yu Tsai , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 25/27] net: stmmac: dwmac-rk: Don't fail if phy regulator is absent Date: Wed, 4 Sep 2019 12:02:18 -0400 Message-Id: <20190904160220.4545-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904160220.4545-1-sashal@kernel.org> References: <20190904160220.4545-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 6e61bccc90b3c..15c063880f888 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -771,10 +771,8 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable) 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); -- 2.20.1