From patchwork Sun Jul 21 16:24:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 260536 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E96582C00C0 for ; Mon, 22 Jul 2013 02:32:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755929Ab3GUQc1 (ORCPT ); Sun, 21 Jul 2013 12:32:27 -0400 Received: from mail-ye0-f174.google.com ([209.85.213.174]:57994 "EHLO mail-ye0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755881Ab3GUQcO (ORCPT ); Sun, 21 Jul 2013 12:32:14 -0400 Received: by mail-ye0-f174.google.com with SMTP id q9so95241yen.33 for ; Sun, 21 Jul 2013 09:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=FXwy1DqSZPnWahZgYL+vE+Ii+1P3f9iT9fQ+lzEklB4=; b=RJpfcqnfkXiF+4NAtQC3WAZ9o+spKiKbnOk3SArfrKRhnbgV4f6uMBrYu+uCoOJYQl +muAT6ygd2VJ3Oc5Y90/mcREkgrRIsDZ2sONlOaGHNV1koAN+dzq4ovJoqBRwWOE4aGX VaTXaG3HG4gzGc8WHr+um4AlSh3WrJc/AJgRKDnMHJC1h7E4tXh9a/N0dbWkFRzD4UcO 0P2llJZO8xzMJBnau3nzO+sK+buCca3cTOVYebapm665UBU921gDUBY2a+CY3Fx9EAGI uk2IoNpanAiIpiuJUYsmIlF96ZA6GyVEM0ZK5AKahrUm0/+Re6T0uiCtcjrsM0YpAxZR Z2fg== X-Received: by 10.236.128.162 with SMTP id f22mr12080555yhi.1.1374423934117; Sun, 21 Jul 2013 09:25:34 -0700 (PDT) Received: from localhost.localdomain ([189.5.19.145]) by mx.google.com with ESMTPSA id i27sm34053395yhj.24.2013.07.21.09.25.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 21 Jul 2013 09:25:33 -0700 (PDT) From: Fabio Estevam To: davem@davemloft.net Cc: kernel@pengutronix.de, Frank.Li@freescale.com, shawn.guo@linaro.org, netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH 1/6] fec: Do not enable/disable optional clocks unconditionally Date: Sun, 21 Jul 2013 13:24:59 -0300 Message-Id: <1374423904-2668-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374423904-2668-1-git-send-email-festevam@gmail.com> References: <1374423904-2668-1-git-send-email-festevam@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Fabio Estevam clk_enet_out and clk_ptp are optional clocks, so we should not enable/disable them unconditionally. Signed-off-by: Fabio Estevam --- drivers/net/ethernet/freescale/fec_main.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index f0f0e96..de9bf7a 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2105,8 +2105,10 @@ fec_probe(struct platform_device *pdev) clk_prepare_enable(fep->clk_ahb); clk_prepare_enable(fep->clk_ipg); - clk_prepare_enable(fep->clk_enet_out); - clk_prepare_enable(fep->clk_ptp); + if (fep->clk_enet_out) + clk_prepare_enable(fep->clk_enet_out); + if (fep->clk_ptp) + clk_prepare_enable(fep->clk_ptp); fep->reg_phy = devm_regulator_get(&pdev->dev, "phy"); if (!IS_ERR(fep->reg_phy)) { @@ -2179,8 +2181,10 @@ failed_init: failed_regulator: clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); - clk_disable_unprepare(fep->clk_enet_out); - clk_disable_unprepare(fep->clk_ptp); + if (fep->clk_enet_out) + clk_disable_unprepare(fep->clk_enet_out); + if (fep->clk_ptp) + clk_disable_unprepare(fep->clk_ptp); failed_clk: failed_ioremap: free_netdev(ndev); @@ -2206,10 +2210,12 @@ fec_drv_remove(struct platform_device *pdev) } if (fep->reg_phy) regulator_disable(fep->reg_phy); - clk_disable_unprepare(fep->clk_ptp); + if (fep->clk_ptp) + clk_disable_unprepare(fep->clk_ptp); if (fep->ptp_clock) ptp_clock_unregister(fep->ptp_clock); - clk_disable_unprepare(fep->clk_enet_out); + if (fep->clk_enet_out) + clk_disable_unprepare(fep->clk_enet_out); clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); free_netdev(ndev); @@ -2228,7 +2234,8 @@ fec_suspend(struct device *dev) fec_stop(ndev); netif_device_detach(ndev); } - clk_disable_unprepare(fep->clk_enet_out); + if (fep->clk_enet_out) + clk_disable_unprepare(fep->clk_enet_out); clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); @@ -2251,7 +2258,8 @@ fec_resume(struct device *dev) return ret; } - clk_prepare_enable(fep->clk_enet_out); + if (fep->clk_enet_out) + clk_prepare_enable(fep->clk_enet_out); clk_prepare_enable(fep->clk_ahb); clk_prepare_enable(fep->clk_ipg); if (netif_running(ndev)) {