From patchwork Tue Sep 2 01:12:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 384941 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 85EC71401AA for ; Tue, 2 Sep 2014 11:13:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753203AbaIBBNZ (ORCPT ); Mon, 1 Sep 2014 21:13:25 -0400 Received: from mail-vc0-f179.google.com ([209.85.220.179]:42331 "EHLO mail-vc0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753061AbaIBBNX (ORCPT ); Mon, 1 Sep 2014 21:13:23 -0400 Received: by mail-vc0-f179.google.com with SMTP id hy4so6130790vcb.24 for ; Mon, 01 Sep 2014 18:13:22 -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:in-reply-to:references; bh=ZdgNH3mQsnX1gVeES5d8PAG/SIe5holBQ+MiYEfBnCg=; b=l3DdyD0eWAgAYC/6Df2GjYS+b+hEqveIsPLD0D1tqTMkOePYfkcrTQwjTahpqRB887 HBvKm64e/e7VZcyw97xZczkBRu0cNfl2+eOz4bBc0OWcMQYaPmsxLI5WcXKX5ZoFlkkS vTswosauAyn0iYg9soVYR0hHU4ZaE/27z54nT2RI+1Kay1BhYxkbz9IBJnc7tKBXT6Uy NYHqDhn/RtWs2q0AlOscFPpvIATJtE6a0YFU/usK+/WjGP2NtMuztNa6yERTTFCUG222 ato5Dwt7MYQTRmCBCo7G3Q+07pQki3y2UKMPPM4HvJ2lfFo1RquqqdnQBGdIg0n/MARZ hZPA== X-Received: by 10.220.44.80 with SMTP id z16mr27796654vce.7.1409620402619; Mon, 01 Sep 2014 18:13:22 -0700 (PDT) Received: from localhost.localdomain ([201.82.52.106]) by mx.google.com with ESMTPSA id jm8sm6046738vdb.27.2014.09.01.18.13.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Sep 2014 18:13:21 -0700 (PDT) From: Fabio Estevam To: davem@davemloft.net Cc: linux@arm.linux.org.uk, B38611@freescale.com, netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH net-next 1/3] fec: Do not set fep->clk_ptp to NULL on error Date: Mon, 1 Sep 2014 22:12:53 -0300 Message-Id: <1409620375-20284-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409620375-20284-1-git-send-email-festevam@gmail.com> References: <1409620375-20284-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 There is no need to set fep->clk_ptp to NULL when devm_clk_get() returns an error. We can simply use IS_ERR() instead, which makes the code simpler. Signed-off-by: Fabio Estevam --- drivers/net/ethernet/freescale/fec_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 89355a7..76e4f56 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1610,7 +1610,7 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) if (ret) goto failed_clk_enet_out; } - if (fep->clk_ptp) { + if (!IS_ERR(fep->clk_ptp)) { mutex_lock(&fep->ptp_clk_mutex); ret = clk_prepare_enable(fep->clk_ptp); if (ret) { @@ -1626,7 +1626,7 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) clk_disable_unprepare(fep->clk_ipg); if (fep->clk_enet_out) clk_disable_unprepare(fep->clk_enet_out); - if (fep->clk_ptp) { + if (!IS_ERR(fep->clk_ptp)) { mutex_lock(&fep->ptp_clk_mutex); clk_disable_unprepare(fep->clk_ptp); fep->ptp_clk_on = false; @@ -2640,10 +2640,8 @@ fec_probe(struct platform_device *pdev) fep->clk_ptp = devm_clk_get(&pdev->dev, "ptp"); fep->bufdesc_ex = pdev->id_entry->driver_data & FEC_QUIRK_HAS_BUFDESC_EX; - if (IS_ERR(fep->clk_ptp)) { - fep->clk_ptp = NULL; + if (IS_ERR(fep->clk_ptp)) fep->bufdesc_ex = 0; - } ret = fec_enet_clk_enable(ndev, true); if (ret)