From patchwork Sun Oct 1 11:02:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820255 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RNw+A1GN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j6y4cxrz9t2V for ; Sun, 1 Oct 2017 22:02:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751138AbdJALCP (ORCPT ); Sun, 1 Oct 2017 07:02:15 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36720 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbdJALCN (ORCPT ); Sun, 1 Oct 2017 07:02:13 -0400 Received: by mail-wm0-f67.google.com with SMTP id 63so678469wmn.3 for ; Sun, 01 Oct 2017 04:02:12 -0700 (PDT) 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=/+eszXk8aFpWJrxTbJ/QkRiJ0VmXeFFSvgGJJzivwBw=; b=RNw+A1GNPME0UZmAnNxD+LCgQ5VVHuIx66Mpa1EDuj91lOO7lT7DhlD+C1LWnm0NTF xBAkDX30f1P6I619Mpq0znMZQN3GceQhtu0DtJFzUBaAuVGjlZ0W0FuIbvYy5luVVyuY RSE+bBFiJH8o/NLn2bLXz4kco2Uj6ORgWoBR8NYXt2oiLIqVxSq3hy3dH6TDjH5wdSsL 5DgCzZ3NvKoIRXvCvyNUBMqEiRyhVzbDVewwlXFv7ja6cloVWpcwFVUH2KGY9by49QHR VR6YhN8u9lI+n2ddAxDYh0LIRbtPLTcIiBqdUCQw5xPkA3vAM009AJWxUmkiQ2TRXyTL BZQQ== 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=/+eszXk8aFpWJrxTbJ/QkRiJ0VmXeFFSvgGJJzivwBw=; b=QRxsqtEbKxKhDjMpzm87A4dEB6XjgrOPa3lDyIJ1e8kTM5hXYQmTjDDLgrQs0ulMSU KRGbv62zwZjlWYIzS5HwTDQEaumm/hww2oQxwamMhWvoDFl5Y31j+YPborggp59e4zvv ZXpzOu3m4vz/bt2Jl6PUi3386aCTcssCVknOekq4Y3GSPkecmOamUZ4Ekr//Xl44A9jh vxSJXw/fEYp3MToBq9gMc0HOdjykbN1OTDvisaF3SFXDT0ZApmybuaxuMd48ELCKvUxu xAV/QpmywJehAaMvxuNrNSNsmXG33EHF8qDxKsb5PkY5xDgM7MLUVXtygw2/5SMuE44w p75A== X-Gm-Message-State: AHPjjUhq7OvKc2aP41DFX70ev58gqMJ7HjD8Z/d3D6nlAQWgBXSmrFfi l2NhVaofRw/OO9pcnqNCzS51gg== X-Google-Smtp-Source: AOwi7QAxjvryYq7EUUX55fp1WmgL+dPbac8f9m7wPjf24eXuZhdk1xEuwXHdH+1ua5WUyPqzZrKFhg== X-Received: by 10.80.241.92 with SMTP id z28mr16426598edl.294.1506855732060; Sun, 01 Oct 2017 04:02:12 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:11 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 1/6] bcm63xx_enet: correct clock usage Date: Sun, 1 Oct 2017 13:02:15 +0200 Message-Id: <20171001110220.27668-2-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Check the return code of prepare_enable and change one last instance of enable only to prepare_enable. Also properly disable and release the clock in error paths and on remove for enetsw. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 31 +++++++++++++++++++++------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index c6221f04a748..a45ec97b5b1e 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1773,7 +1773,9 @@ static int bcm_enet_probe(struct platform_device *pdev) ret = PTR_ERR(priv->mac_clk); goto out; } - clk_prepare_enable(priv->mac_clk); + ret = clk_prepare_enable(priv->mac_clk); + if (ret) + goto out_put_clk_mac; /* initialize default and fetch platform data */ priv->rx_ring_size = BCMENET_DEF_RX_DESC; @@ -1805,9 +1807,11 @@ static int bcm_enet_probe(struct platform_device *pdev) if (IS_ERR(priv->phy_clk)) { ret = PTR_ERR(priv->phy_clk); priv->phy_clk = NULL; - goto out_put_clk_mac; + goto out_disable_clk_mac; } - clk_prepare_enable(priv->phy_clk); + ret = clk_prepare_enable(priv->phy_clk); + if (ret) + goto out_put_clk_phy; } /* do minimal hardware init to be able to probe mii bus */ @@ -1900,13 +1904,16 @@ static int bcm_enet_probe(struct platform_device *pdev) out_uninit_hw: /* turn off mdc clock */ enet_writel(priv, 0, ENET_MIISC_REG); - if (priv->phy_clk) { + if (priv->phy_clk) clk_disable_unprepare(priv->phy_clk); + +out_put_clk_phy: + if (priv->phy_clk) clk_put(priv->phy_clk); - } -out_put_clk_mac: +out_disable_clk_mac: clk_disable_unprepare(priv->mac_clk); +out_put_clk_mac: clk_put(priv->mac_clk); out: free_netdev(dev); @@ -2748,7 +2755,9 @@ static int bcm_enetsw_probe(struct platform_device *pdev) ret = PTR_ERR(priv->mac_clk); goto out_unmap; } - clk_enable(priv->mac_clk); + ret = clk_prepare_enable(priv->mac_clk); + if (ret) + goto out_put_clk; priv->rx_chan = 0; priv->tx_chan = 1; @@ -2769,7 +2778,7 @@ static int bcm_enetsw_probe(struct platform_device *pdev) ret = register_netdev(dev); if (ret) - goto out_put_clk; + goto out_disable_clk; netif_carrier_off(dev); platform_set_drvdata(pdev, dev); @@ -2778,6 +2787,9 @@ static int bcm_enetsw_probe(struct platform_device *pdev) return 0; +out_disable_clk: + clk_disable_unprepare(priv->mac_clk); + out_put_clk: clk_put(priv->mac_clk); @@ -2809,6 +2821,9 @@ static int bcm_enetsw_remove(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(res->start, resource_size(res)); + clk_disable_unprepare(priv->mac_clk); + clk_put(priv->mac_clk); + free_netdev(dev); return 0; }