From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965128AbbJ2NXm (ORCPT ); Thu, 29 Oct 2015 09:23:42 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37092 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964997AbbJ2NXi (ORCPT ); Thu, 29 Oct 2015 09:23:38 -0400 From: Neil Armstrong Subject: [PATCH v2 6/6] net: dsa: move dsa slave destroy code to slave.c To: "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Guenter Roeck , vivien.didelot@savoirfairelinux.com, Fabian Frederick , Pavel Nakonechny , Joe Perches , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frode Isaksen Organization: Baylibre Message-ID: <56321DD3.3030708@baylibre.com> Date: Thu, 29 Oct 2015 14:23:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move dsa slave dedicated code from dsa_switch_destroy to a new dsa_slave_destroy function in slave.c Signed-off-by: Frode Isaksen Signed-off-by: Neil Armstrong --- net/dsa/dsa.c | 5 +---- net/dsa/dsa_priv.h | 1 + net/dsa/slave.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 11452e4..cf6b092 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -454,10 +454,7 @@ static void dsa_switch_destroy(struct dsa_switch *ds) if (!ds->ports[port]) continue; - netif_carrier_off(ds->ports[port]); - unregister_netdev(ds->ports[port]); - phy_disconnect(p->phy); - free_netdev(ds->ports[port]); + dsa_slave_destroy(ds->ports[port]); } mdiobus_unregister(ds->slave_mii_bus); diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 311796c8..1d1a546 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -61,6 +61,7 @@ extern const struct dsa_device_ops notag_netdev_ops; void dsa_slave_mii_bus_init(struct dsa_switch *ds); int dsa_slave_create(struct dsa_switch *ds, struct device *parent, int port, char *name); +void dsa_slave_destroy(struct net_device *slave_dev); int dsa_slave_suspend(struct net_device *slave_dev); int dsa_slave_resume(struct net_device *slave_dev); int dsa_slave_netdevice_event(struct notifier_block *unused, diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 481754e..f77e5bd 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1223,6 +1223,16 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent, return 0; } +void dsa_slave_destroy(struct net_device *slave_dev) +{ + struct dsa_slave_priv *p = netdev_priv(slave_dev); + + netif_carrier_off(slave_dev); + unregister_netdev(slave_dev); + phy_disconnect(p->phy); + free_netdev(slave_dev); +} + static bool dsa_slave_dev_check(struct net_device *dev) { return dev->netdev_ops == &dsa_slave_netdev_ops; -- 1.9.1