From patchwork Tue Sep 2 01:12:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 384943 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 D9AF814018A for ; Tue, 2 Sep 2014 11:13:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753223AbaIBBNa (ORCPT ); Mon, 1 Sep 2014 21:13:30 -0400 Received: from mail-vc0-f171.google.com ([209.85.220.171]:57718 "EHLO mail-vc0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753061AbaIBBN3 (ORCPT ); Mon, 1 Sep 2014 21:13:29 -0400 Received: by mail-vc0-f171.google.com with SMTP id id10so6254149vcb.16 for ; Mon, 01 Sep 2014 18:13:28 -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=YkD6rt856sUYDcUVT3Q9Qj7RN9hlMxBvXCKLELdWAAc=; b=rhAxBFo+NHJRzotVOWrDy1a6Cnqdg4V9aXFTBaKazrewGF9Qh0lI696nA/4ZNkuh4g IPorzRIr/tkz/SXd1Q6YcNYFhWXpFKU4xe8s8KN05AgTGmM1lgCr6f3jGyWhfcVgnkmS AYu3ROyBVZvUAjqDEC2+5Eqz0r9bRaWYTQH4YV4c8OSMJOV2LuQ2lxrT0GBYisxIFtNC W0k0333finapj7P8mqMim/WCZsRE9bwF5+YjzWMDtDeGgZbzsLFHPjmNangR6hYKfpO+ Kzvm1Lb3ElWoOX+iUrpNW9BAcoAw7RBavCw2ooFnPpfE/7mySW/fJ6YqqMVJBHVsKbKl NToQ== X-Received: by 10.220.105.201 with SMTP id u9mr27998061vco.11.1409620408296; Mon, 01 Sep 2014 18:13:28 -0700 (PDT) Received: from localhost.localdomain ([201.82.52.106]) by mx.google.com with ESMTPSA id jm8sm6046738vdb.27.2014.09.01.18.13.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Sep 2014 18:13:27 -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 3/3] fec: Do not set fep->reg_phy to NULL on error Date: Mon, 1 Sep 2014 22:12:55 -0300 Message-Id: <1409620375-20284-4-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->reg_phy to NULL when devm_regulator_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 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index e87cc66..39c28d1 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2653,8 +2653,6 @@ fec_probe(struct platform_device *pdev) "Failed to enable phy regulator: %d\n", ret); goto failed_regulator; } - } else { - fep->reg_phy = NULL; } fec_reset_phy(pdev); @@ -2704,7 +2702,7 @@ failed_register: failed_mii_init: failed_irq: failed_init: - if (fep->reg_phy) + if (!IS_ERR(fep->reg_phy)) regulator_disable(fep->reg_phy); failed_regulator: fec_enet_clk_enable(ndev, false); @@ -2727,7 +2725,7 @@ fec_drv_remove(struct platform_device *pdev) cancel_work_sync(&fep->tx_timeout_work); unregister_netdev(ndev); fec_enet_mii_remove(fep); - if (fep->reg_phy) + if (!IS_ERR(fep->reg_phy)) regulator_disable(fep->reg_phy); if (fep->ptp_clock) ptp_clock_unregister(fep->ptp_clock); @@ -2757,7 +2755,7 @@ static int __maybe_unused fec_suspend(struct device *dev) fec_enet_clk_enable(ndev, false); pinctrl_pm_select_sleep_state(&fep->pdev->dev); - if (fep->reg_phy) + if (!IS_ERR(fep->reg_phy)) regulator_disable(fep->reg_phy); return 0; @@ -2769,7 +2767,7 @@ static int __maybe_unused fec_resume(struct device *dev) struct fec_enet_private *fep = netdev_priv(ndev); int ret; - if (fep->reg_phy) { + if (!IS_ERR(fep->reg_phy)) { ret = regulator_enable(fep->reg_phy); if (ret) return ret; @@ -2794,7 +2792,7 @@ static int __maybe_unused fec_resume(struct device *dev) return 0; failed_clk: - if (fep->reg_phy) + if (!IS_ERR(fep->reg_phy)) regulator_disable(fep->reg_phy); return ret; }