From patchwork Wed Sep 10 07:51:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Perier X-Patchwork-Id: 387598 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 0898C1400AA for ; Wed, 10 Sep 2014 17:48:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752009AbaIJHsx (ORCPT ); Wed, 10 Sep 2014 03:48:53 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:64687 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751993AbaIJHsw (ORCPT ); Wed, 10 Sep 2014 03:48:52 -0400 Received: by mail-wi0-f171.google.com with SMTP id hi2so5743095wib.4 for ; Wed, 10 Sep 2014 00:48:51 -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; bh=LghkMm4tdUiR2/jzxHJLSPwCsWmxAdBrHGNZC1VQlrQ=; b=O9sNTM2EjF7s+PN69LnHWOvSuNW+FGEjiMNBo6gFkAAdvxqR6g7QGLqi4oOD8G3mfL 2/Fk7mLy1CW3rY2l6LQNjxpoB1W8oC6Gla3gRDfy36X/xFbnkCnGGDP+gJLa+bgLwSFv UwXmMWdsNCK8ZENMn4gok0OTD4+DzesoclntOa8A4qwh+iH1aXJNqss8fsn1WYmDHQ7c OxTk2ZUfGih65sZlH17zHGj3vHl5McOP0U3mq4RQ7tXU1QBfsG8IiBwxSYCpgVCm2hBk MPFqtY7ZhpbB8ys34bMohchXbZ5PYRpCLzvr66ZEbn18cHtfc/wqQVts1e9YCa/0/CML Pf8w== X-Received: by 10.194.249.164 with SMTP id yv4mr49169528wjc.34.1410335331840; Wed, 10 Sep 2014 00:48:51 -0700 (PDT) Received: from localhost.localdomain (AToulouse-554-1-131-65.w90-60.abo.wanadoo.fr. [90.60.106.65]) by mx.google.com with ESMTPSA id r19sm1451603wik.0.2014.09.10.00.48.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Sep 2014 00:48:51 -0700 (PDT) From: Romain Perier To: heiko@sntech.de Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH v1] net: ethernet: arc: Don't free Rockchip resources before disconnect from phy Date: Wed, 10 Sep 2014 07:51:13 +0000 Message-Id: <1410335473-23573-1-git-send-email-romain.perier@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Free resources before being disconnected from phy and calling core driver is wrong and should not happen. It avoids a delay of 4-5s caused by the timeout of phy_disconnect(). Signed-off-by: Romain Perier --- drivers/net/ethernet/arc/emac_rockchip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c index 51d0585..c31c740 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -202,12 +202,13 @@ static int emac_rockchip_remove(struct platform_device *pdev) struct rockchip_priv_data *priv = netdev_priv(ndev); int err; + err = arc_emac_remove(ndev); + clk_disable_unprepare(priv->refclk); if (priv->regulator) regulator_disable(priv->regulator); - err = arc_emac_remove(ndev); free_netdev(ndev); return err; }