From patchwork Mon Apr 16 22:04:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 898965 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sb7KsK/X"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Q2Vp4H3xz9s0n for ; Tue, 17 Apr 2018 08:05:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753014AbeDPWFE (ORCPT ); Mon, 16 Apr 2018 18:05:04 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:40384 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752796AbeDPWE4 (ORCPT ); Mon, 16 Apr 2018 18:04:56 -0400 Received: by mail-pl0-f67.google.com with SMTP id t22-v6so2175903plo.7; Mon, 16 Apr 2018 15:04:56 -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:in-reply-to:references; bh=pvE1EA5utxYFIufUv7EZA36NssFwpEYQBozyLnGCQpE=; b=Sb7KsK/XssV8BL4lzRScIg3uAjzfomr4DaUROrOxlw1X4dbVQlmpRHTCkMomVb8xJw 44z6G8E6YXPTM3VPMwPAFkRr8k0H8kjiUzruxtnNvknDqv4hDIzg+7ZNKLI75SzrkLSJ E8CHE2z3b5okA3UpiA86gjqIFaYETF4tvaDNdSCEmEB5/Qjtd7INbXwDgYy5PpHYAM7Q V6gcdq8F9luv7BVC1tgFazek8Uejc0zBFEPw0OBL1+rY07jJEP0rJSSy5LbFOpabEpEW bGHOjtj26KQnAffEwUtj2ZKDHpupYmB1heTY7U4LBEUS7UvYP3vUqzA1z5dShp3/Vsz2 nr+w== 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:in-reply-to :references; bh=pvE1EA5utxYFIufUv7EZA36NssFwpEYQBozyLnGCQpE=; b=jTg04jBzgyBM1xoH6F89eolmj2+Ad5cc24fa6L+awXSxVpiRrlZ0FnUUXinkQEE3+y AWyv5uQCNZGElFWKv5lmozWvqaSmzGMocOL1zBPvRqSJF3xCOzhnLJ54DGBl4pfHiB4h w2PhoX+N81Bve+QjPw/q7Wn3eAXWZC2/9Vznx4/0K4IPzM0B8rMZAvNlwdGBedknParA PVdXxltN5fanHACXSlP5k1+DGA3aCqV6run3qllwL2XbPq/4yKZgCEzcH2WZyD+0y+N4 x0voRTUwmKe5m7gc/RupF7Z+OL8SiVgMEDqPsZsiKVzur025Rh+Nr86fzZdUMpJ6blTD H67g== X-Gm-Message-State: ALQs6tB9YbDvKqaAuTQzVjCnkeViOdoKV6kx9UN0XIyvWI0mE2yKhQ7v icPg/4VzGscNhSya2pAVpQ0= X-Google-Smtp-Source: AIpwx4/2drdgHFptp5D2dvZC5nt4Etbw0SnmahpXae0gYpcVz+DGunk5q4c1ULt9mhQqHsfodMNtMA== X-Received: by 2002:a17:902:be08:: with SMTP id r8-v6mr16577646pls.289.1523916296467; Mon, 16 Apr 2018 15:04:56 -0700 (PDT) Received: from xplor.waratah.dyndns.org (222-154-41-72-adsl.bb.spark.co.nz. [222.154.41.72]) by smtp.gmail.com with ESMTPSA id p73sm27490071pfa.43.2018.04.16.15.04.52 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Apr 2018 15:04:53 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 06876360077; Tue, 17 Apr 2018 10:04:49 +1200 (NZST) From: Michael Schmitz To: netdev@vger.kernel.org Cc: linux-m68k@vger.kernel.org, Michael.Karcher@fu-berlin.de, Michael Karcher , Michael Karcher , Michael Schmitz Subject: [PATCH 02/10] net: ax88796: Attach MII bus only when open Date: Tue, 17 Apr 2018 10:04:37 +1200 Message-Id: <1523916285-6057-3-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1523916285-6057-1-git-send-email-schmitzmic@gmail.com> References: <1523916285-6057-1-git-send-email-schmitzmic@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Michael Karcher Call ax_mii_init in ax_open(), and unregister/remove mdiobus resources in ax_close(). This is needed to be able to unload the module, as the module is busy while the MII bus is attached. Signed-off-by: Michael Karcher Signed-off-by: Michael Schmitz --- drivers/net/ethernet/8390/ax88796.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index 2a256aa..f7b8911 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -79,6 +79,8 @@ static u32 ax_msg_enable; +static int ax_mii_init(struct net_device *dev); + /* device private data */ struct ax_device { @@ -396,6 +398,10 @@ static int ax_open(struct net_device *dev) netdev_dbg(dev, "open\n"); + ret = ax_mii_init(dev); + if (ret) + goto failed_request_irq; + ret = request_irq(dev->irq, ax_ei_interrupt, ax->irqflags, dev->name, dev); if (ret) @@ -442,6 +448,9 @@ static int ax_close(struct net_device *dev) phy_disconnect(dev->phydev); free_irq(dev->irq, dev); + + mdiobus_unregister(ax->mii_bus); + free_mdio_bitbang(ax->mii_bus); return 0; } @@ -758,10 +767,6 @@ static int ax_init_dev(struct net_device *dev) dev->netdev_ops = &ax_netdev_ops; dev->ethtool_ops = &ax_ethtool_ops; - ret = ax_mii_init(dev); - if (ret) - goto err_out; - ax_NS8390_init(dev, 0); ret = register_netdev(dev);