From patchwork Sun Jan 3 11:25:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 11995691 X-Patchwork-Delegate: kuba@kernel.org 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 72E4EC433E9 for ; Sun, 3 Jan 2021 11:27:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A8FD21E92 for ; Sun, 3 Jan 2021 11:27:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726735AbhACL0y (ORCPT ); Sun, 3 Jan 2021 06:26:54 -0500 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]:43401 "EHLO wnew4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726008AbhACL0w (ORCPT ); Sun, 3 Jan 2021 06:26:52 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id B8381542; Sun, 3 Jan 2021 06:25:45 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 03 Jan 2021 06:25:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=xMlquvf3yzLui EN8mbFrfPmz2sg7YCp1DdhC7ccdm/c=; b=eEIciF+9rZgKJxlYNf7F6ftlaJ58l wS8D5yUbr9D9PZdCHxFpjB9GWls0UA+CeMDMeByNw8CWMBL4FAasZ7aR/IjCQsCG pzgziJgSpLEPDkvbX1XsFrg1/kyqM9PkFAt2EKbModk2saX4eN0P+d3Be/kzAJ+z CJqw93xmBkjgRVgWlOM0IWVpEBRQA+FgTHYVM1gRWDdLwVVYGVp/2+BKltsygA4y xg75/UxU+Oujdnw5ZhjHJQFgi2FN4PgoJh6ky6zk+X4XmyfKMfTMNC1WelZybvBQ WjSABS2J3rbaF4T39VqtqTUNWMGjjaxpFS14saOr23t1kIaF6pljUmIWg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=xMlquvf3yzLuiEN8mbFrfPmz2sg7YCp1DdhC7ccdm/c=; b=DcyZIdxT DDpLLCCnPKy1f1Zo5+SvZ6iiImF/OsTyibXoMKd2ok2aEgxl3HlGmC/rUNE+AfYa bg/sTK+5TSeSpmIYFWkHA995xsy5LydpVisFwedO2v6VX5ZiezYpAzBSsy0SJMJt okYBL3dg8waK2zTuXFM269nPI0v66NA6cFeM7i/lMKQZfWtwKDKkTyPGleav4GH1 NgDNoq5cJZYuMhv+UBSzxFJKPsw4DS0FDrYRuZf1gOu93KJzNxHnIkIIdVBiOr4E 147g25gT7PNoA6S09mKZUVlkePR1Fl260l2Cn/x6ZW3JWr1UFHnlaV101BXH6QdK Gi94FinsYY3Kjg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdefuddgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 8B2C0108005F; Sun, 3 Jan 2021 06:25:44 -0500 (EST) From: Samuel Holland To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Corentin Labbe Cc: Ondrej Jirman , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Samuel Holland Subject: [PATCH net-next 3/5] net: stmmac: dwmac-sun8i: Use reset_control_reset Date: Sun, 3 Jan 2021 05:25:40 -0600 Message-Id: <20210103112542.35149-4-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103112542.35149-1-samuel@sholland.org> References: <20210103112542.35149-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Use the appropriate function instead of reimplementing it, and update the error message to match the code. Signed-off-by: Samuel Holland Reviewed-by: Chen-Yu Tsai --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 3c3d0b99d3e8..0e8d88417251 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -806,11 +806,9 @@ static int sun8i_dwmac_power_internal_phy(struct stmmac_priv *priv) /* Make sure the EPHY is properly reseted, as U-Boot may leave * it at deasserted state, and thus it may fail to reset EMAC. */ - reset_control_assert(gmac->rst_ephy); - - ret = reset_control_deassert(gmac->rst_ephy); + ret = reset_control_reset(gmac->rst_ephy); if (ret) { - dev_err(priv->device, "Cannot deassert internal phy\n"); + dev_err(priv->device, "Cannot reset internal PHY\n"); clk_disable_unprepare(gmac->ephy_clk); return ret; }