From patchwork Fri Aug 25 14:38:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 805918 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="OYbLFCpw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xf3jv4lDGz9sN5 for ; Sat, 26 Aug 2017 00:40:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756952AbdHYOkY (ORCPT ); Fri, 25 Aug 2017 10:40:24 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:37966 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756256AbdHYOkW (ORCPT ); Fri, 25 Aug 2017 10:40:22 -0400 Received: by mail-wr0-f194.google.com with SMTP id o76so1225777wrb.5; Fri, 25 Aug 2017 07:40:22 -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; bh=3BXrJv8zP4XEFEzPLrDU/mO6bAo77tUoLLbUfz4qlOE=; b=OYbLFCpwnAip6QlBNVQwBUgcsCaGgwa9CNO8M+xTh4qfeB/mGgN4bjjO6qqcVoztX7 /J6f2ZBZVEJkSDEDiHIDb01aInj5teeyA23Or8noL/hNDktu6955rAjSRxZJ5P32AlFQ hXqkBTDLi0q/xQZsGs9PNVHbYW3szAY8SwIrKTHqQtd5TlzW+0iEFmzFa01Eb6d+XdL4 VzK1o7ZC7kXGMWGQlNkrpCNvx4A6kc5TbefYkn35Y8eARRPr/br85U3AfxyRJfu3gyyu ec6bcaZuj8kEpuMpL+9KQ2NolOUhzWm41DneLQ6+XZh1U1wHK7ML9AbrGG6SqzFD/Un4 xB6w== 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; bh=3BXrJv8zP4XEFEzPLrDU/mO6bAo77tUoLLbUfz4qlOE=; b=m+wB+vAiUJEJt0ee1WOlQ9nHAYMpBb/XjhzWSe+EIwLsW0QQcIRUkc2oxke5l3bqax 9kTZy8WU12eHLxyiCVOxMqScWWxAiZj9YA/s7scTfWk+a3irqSAXd7/+RHB9daMfl0PW O1G1gz5moU5doLV8A4MhuqJQwpzz4j+Df2OZHwd4MW/PqmA5ffL7uCz7XrYw9hwpwnK6 YLFx0w/iyTwzspJWFG2ECE0o7rReBocpZygS8PO6dm8pqw5yijupHH3297SMF3AXo6e5 ObCNmBsnW7kgaj2OV/zVvZq4a10h1HeXC2CLar+SsWpquWe1lPECqcmbZ3B6QkI6FGPf 6tgA== X-Gm-Message-State: AHYfb5hD5A3fz2OXIZql7MMb12bWvIFzXO7t4Esn/fNPtOVxlABhcpEh Ha5xdlddv1xxS72t X-Received: by 10.223.136.39 with SMTP id d36mr5621383wrd.136.1503672021622; Fri, 25 Aug 2017 07:40:21 -0700 (PDT) Received: from Red.local (LFbn1-1-65-78.w90-118.abo.wanadoo.fr. [90.118.156.78]) by smtp.googlemail.com with ESMTPSA id h66sm1549071wmd.38.2017.08.25.07.40.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Aug 2017 07:40:20 -0700 (PDT) From: Corentin Labbe To: peppe.cavallaro@st.com, alexandre.torgue@st.com, maxime.ripard@free-electrons.com, wens@csie.org Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH] net: stmmac: dwmac-sun8i: Use reset exclusive Date: Fri, 25 Aug 2017 16:38:05 +0200 Message-Id: <20170825143805.21733-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current dwmac_sun8i module cannot be rmmod/modprobe due to that the reset controller was not released when removed. This patch remove ambiguity, by using of_reset_control_get_exclusive and add the missing reset_control_put(). Signed-off-by: Corentin Labbe --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index fffd6d5fc907..675a09629d85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -782,6 +782,7 @@ static int sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) clk_disable_unprepare(gmac->ephy_clk); reset_control_assert(gmac->rst_ephy); + reset_control_put(gmac->rst_ephy); return 0; } @@ -942,7 +943,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) return -EINVAL; } - gmac->rst_ephy = of_reset_control_get(plat_dat->phy_node, NULL); + gmac->rst_ephy = of_reset_control_get_exclusive(plat_dat->phy_node, NULL); if (IS_ERR(gmac->rst_ephy)) { ret = PTR_ERR(gmac->rst_ephy); if (ret == -EPROBE_DEFER)