From patchwork Wed Feb 17 04:20:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 384266 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, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 B96D1C433E0 for ; Wed, 17 Feb 2021 04:27:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 75CFF64DF3 for ; Wed, 17 Feb 2021 04:27:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230315AbhBQE0g (ORCPT ); Tue, 16 Feb 2021 23:26:36 -0500 Received: from new4-smtp.messagingengine.com ([66.111.4.230]:47597 "EHLO new4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231218AbhBQEVP (ORCPT ); Tue, 16 Feb 2021 23:21:15 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 599C0580376; Tue, 16 Feb 2021 23:20:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 16 Feb 2021 23:20:09 -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=fm2; bh=n2MqGhQ5o4Ylt VCPJ1jY0hzOaCnyziRkK7pQjX/OSoE=; b=bdWVV8mYOlJeYKBDDjEBZE1OZGm/H VyVacPJAcKwStlWAYmVO4J0XEKavxZyFvlUqZ2O/geyoI/nJEWr5Cm/e3euGhGaj Da4hSRGjKmMIuyA8by20VEgXb7Es5I7lnFl7Dgy3Q4wEp4q4x9IjOfUFgcMLmhyr DJMyziqKAqBJWaH/2HWnAwcFIagsAvT51DnQ1TA7qUYjUAjtjmY/U+lRfieSKxmG SBCkrJOLfcEVci0dL0Gb+oOv/Me/5gqAAukOqpVopXojgxa77XcBn3F4SHc1k9aU m9xDmgornL/t3byZL1CMLxwoJxnS3LKR+kmYmaTK57hJD/z0yooZETBQQ== 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= fm2; bh=n2MqGhQ5o4YltVCPJ1jY0hzOaCnyziRkK7pQjX/OSoE=; b=j6p8JpPl us5XEIAth3QRuQQxrso0QlVc5oXFivMY87+BZ/HSYvR2dOV/4b9XREtOnqGh/mm8 G5tZxWdzbJTG9xh9LRhsvPWMDbyDrvRg4RGGDeH5B4SeyAGi/xU+h1Qak9LVYyJF gULM8XgoGrz+UIk/83zbHf7snVojKcfW+9J9yr+ZsCKHVdrwADPMH8bcmN31RWpn AQiKBdugfr72dJ8Wuh4tuudumrxR2WmngtH657WR64uYPGFBBCx96eZZkFaKFw/p l6UA0ZBLFd/vcWMfNp3NVp+TXyQByV7gQn/v2tyVPnoJ/ntqe9PohzzUXMts+3yB DruiMqX/vkx6ew== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrjedugdeikecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 AA6AC240062; Tue, 16 Feb 2021 23:20:07 -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 v2 1/5] net: stmmac: dwmac-sun8i: Return void from PHY unpower Date: Tue, 16 Feb 2021 22:20:02 -0600 Message-Id: <20210217042006.54559-2-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210217042006.54559-1-samuel@sholland.org> References: <20210217042006.54559-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a deinitialization function that always returned zero, and that return value was always ignored. Have it return void instead. Reviewed-by: Chen-Yu Tsai Signed-off-by: Samuel Holland --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index a5e0eff4a3874..8e505019adf85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -820,15 +820,14 @@ static int sun8i_dwmac_power_internal_phy(struct stmmac_priv *priv) return 0; } -static int sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) +static void sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) { if (!gmac->internal_phy_powered) - return 0; + return; clk_disable_unprepare(gmac->ephy_clk); reset_control_assert(gmac->rst_ephy); gmac->internal_phy_powered = false; - return 0; } /* MDIO multiplexing switch function From patchwork Wed Feb 17 04:20:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 384268 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=-17.7 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, TVD_SUBJ_WIPE_DEBT, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 A048BC433DB for ; Wed, 17 Feb 2021 04:21:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 54DB064DA8 for ; Wed, 17 Feb 2021 04:21:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231253AbhBQEVZ (ORCPT ); Tue, 16 Feb 2021 23:21:25 -0500 Received: from new4-smtp.messagingengine.com ([66.111.4.230]:54133 "EHLO new4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231195AbhBQEVN (ORCPT ); Tue, 16 Feb 2021 23:21:13 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 47724580374; Tue, 16 Feb 2021 23:20:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 16 Feb 2021 23:20:09 -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=fm2; bh=OdOwRMbhjRgte /bLoZP0VS2UuOzAJR1c1RX9afQgw+k=; b=awSL0WIhHp0aMGesl//hxx3CGq4JF hI0dIO+pGWIE1lNy9lXcFVlm84lQOql/rDMPTr8s69B741sON3AzaPd+fEgmtVdn ohcZ/Y0ffPZEdcDuuM49m8uBx5+Y64CrKAz2sv0m0QEoVc/xawlnfIg+MI3y+ks8 KiZ5JFFzoEXDloB1wjgMPPo/MZmh1LrdNl5WJHRbB1RSz7m04OLKuZGvemc9/I/e E1xhdQP8hKZdYPXBhCrNUhEvgTqq5xrZcv65+CzJMwj9/feMNAg58r4UPRn44hDH tajHnjIqzsOBJWcvHXchVqNvdzC5LYScprFsgaBwgIOoFZrVj8NO+BHmA== 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= fm2; bh=OdOwRMbhjRgte/bLoZP0VS2UuOzAJR1c1RX9afQgw+k=; b=uWOk9hDG 4QxAgqSZ1Kd60sXXxFouoc8WUrta0lHAN6d9obSZL1C0254qdQA/K9PVeGSv2LUZ +3Kx4oxAyKp8KGUJ0bLptfwIt5lmhWsyH9GhUSYAfBm+M2ELfDDwTLVqx964ch6a Rz92s3Mvx2iglGtu9giMiVo5gEritSFfUpNdFcSl8YdMUzDDaliaAPyR9kV+AoZ5 1cSqIdKSyeEc/HgYJQUjkpasH/bkhGon/2SR3XUqbCzN3MQkTtVUh/GRhLvgcGml R6tofDRQfaDGeradgl8FEMnDESwdbIhNbQz/qQP31gtBS50EVJcYCZaWSe4aJtUa ZXynMqrzNklVyw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrjedugdeikecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 45A37240066; Tue, 16 Feb 2021 23:20:08 -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 v2 2/5] net: stmmac: dwmac-sun8i: Remove unnecessary PHY power check Date: Tue, 16 Feb 2021 22:20:03 -0600 Message-Id: <20210217042006.54559-3-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210217042006.54559-1-samuel@sholland.org> References: <20210217042006.54559-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sun8i_dwmac_unpower_internal_phy already checks if the PHY is powered, so there is no need to do it again here. Reviewed-by: Chen-Yu Tsai Signed-off-by: Samuel Holland --- 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 8e505019adf85..3c3d0b99d3e8c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -1018,10 +1018,8 @@ static void sun8i_dwmac_exit(struct platform_device *pdev, void *priv) { struct sunxi_priv_data *gmac = priv; - if (gmac->variant->soc_has_internal_phy) { - if (gmac->internal_phy_powered) - sun8i_dwmac_unpower_internal_phy(gmac); - } + if (gmac->variant->soc_has_internal_phy) + sun8i_dwmac_unpower_internal_phy(gmac); clk_disable_unprepare(gmac->tx_clk);