From patchwork Tue Oct 27 16:36:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 536729 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 0843414030E for ; Wed, 28 Oct 2015 03:36:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre_com.20150623.gappssmtp.com header.i=@baylibre_com.20150623.gappssmtp.com header.b=vh4Dg9WZ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965112AbbJ0QgP (ORCPT ); Tue, 27 Oct 2015 12:36:15 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:37356 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965105AbbJ0QgL (ORCPT ); Tue, 27 Oct 2015 12:36:11 -0400 Received: by wicfv8 with SMTP id fv8so170851621wic.0 for ; Tue, 27 Oct 2015 09:36:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre_com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:cc:organization:message-id:date:user-agent :mime-version:content-type:content-transfer-encoding; bh=iNiLikY0f9S7ak6Ha7c8KxMjTPIZQ+J7GfZBSLDf7lE=; b=vh4Dg9WZL5zif8Z4T26oy58mieTdHUjQpamEJLdslJOtQTBWnYkIB0pwho45md1gLD AuBsH1ekTM//DmNPzR/SohQaEQM9ZXCc8RW0EysYPN9MuFAsyilm/Sj1NRegn1M1+aVP CidNKFIgPhUknNIsSfjcEu9/bL/3hC/9oSpychFMWTUCmeUuvUq+3YbU1Un/FGsgg9pV SND326EW0k0sPMIAHkDQekkyt7wtFYfHowJMcHCKl76NEBw6noBqzBAxLus+FwiL/4zg MdePQLTrbWZMVAD/MK5kqvm4/r/nN08gOCu7AO3h9AeSe0N9sBmTEtJfEDESBnAZuxOc ZXtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:cc:organization:message-id:date :user-agent:mime-version:content-type:content-transfer-encoding; bh=iNiLikY0f9S7ak6Ha7c8KxMjTPIZQ+J7GfZBSLDf7lE=; b=GhnY9fBKDDE6GmtOi9GWwbXCz1FhztrQ8tOuwpW6OInEsNDkugk281MgdPFIhsSQk7 4DjQAWYc08EoTQe2F/GuxjxGnyvN1j+tee3SR4w9NOP/MO/VU5wFms6E0EWiuImd+jbz YJ7uxBo1IhRfQuXB++WgtQ5KASNjRYQ4VQDMViTan3IGb5Jbsq+zBP8AQei4Orej+yBx LY5w/jZPcs3eNg/VbAgCGlAvOQibIT77zBobjhpGiMLSv/bQft1cVKHnEbHifBjqvEDo h3rf29IyQ9k4h5jG0wuKnskaEdvUv72zrW4soir5tl9l7Lh5emVrP7Zb7mo6e1e3EdX2 s8ZA== X-Gm-Message-State: ALoCoQkso5XNa9J+36Cz+OIc2Wj7v178w3LU4itCEAZCQMalhOE2EPCH/fM699lkf2r+2T5ihu/C X-Received: by 10.194.172.1 with SMTP id ay1mr48169098wjc.101.1445963770274; Tue, 27 Oct 2015 09:36:10 -0700 (PDT) Received: from [192.168.2.52] (cag06-6-78-235-100-105.fbx.proxad.net. [78.235.100.105]) by smtp.gmail.com with ESMTPSA id r5sm10042633wia.19.2015.10.27.09.36.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Oct 2015 09:36:09 -0700 (PDT) From: Neil Armstrong Subject: [RFC PATCH 3/3] net: dsa: make usage of mv88e6xxx common remove function 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 Organization: Baylibre Message-ID: <562FA7F7.8010902@baylibre.com> Date: Tue, 27 Oct 2015 17:36:07 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make usage of previously introduced mv88e6xxx common remove function in all mv88e6xxx drivers. Signed-off-by: Neil Armstrong --- drivers/net/dsa/mv88e6123_61_65.c | 1 + drivers/net/dsa/mv88e6131.c | 8 ++++++++ drivers/net/dsa/mv88e6171.c | 1 + drivers/net/dsa/mv88e6352.c | 1 + 4 files changed, 11 insertions(+) diff --git a/drivers/net/dsa/mv88e6123_61_65.c b/drivers/net/dsa/mv88e6123_61_65.c index 4bcfd68..1773c99 100644 --- a/drivers/net/dsa/mv88e6123_61_65.c +++ b/drivers/net/dsa/mv88e6123_61_65.c @@ -122,6 +122,7 @@ struct dsa_switch_driver mv88e6123_61_65_switch_driver = { .priv_size = sizeof(struct mv88e6xxx_priv_state), .probe = mv88e6123_61_65_probe, .setup = mv88e6123_61_65_setup, + .remove = mv88e6xxx_remove_common, .set_addr = mv88e6xxx_set_addr_indirect, .phy_read = mv88e6xxx_phy_read, .phy_write = mv88e6xxx_phy_write, diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c index c73121c..0f559b4 100644 --- a/drivers/net/dsa/mv88e6131.c +++ b/drivers/net/dsa/mv88e6131.c @@ -137,6 +137,13 @@ static int mv88e6131_setup(struct dsa_switch *ds) return mv88e6xxx_setup_ports(ds); } +static void mv88e6131_remove(struct dsa_switch *ds) +{ + mv88e6xxx_ppu_state_remove(ds); + + mv88e6xxx_remove_common(ds); +} + static int mv88e6131_port_to_phy_addr(struct dsa_switch *ds, int port) { struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); @@ -175,6 +182,7 @@ struct dsa_switch_driver mv88e6131_switch_driver = { .priv_size = sizeof(struct mv88e6xxx_priv_state), .probe = mv88e6131_probe, .setup = mv88e6131_setup, + .remove = mv88e6131_remove, .set_addr = mv88e6xxx_set_addr_direct, .phy_read = mv88e6131_phy_read, .phy_write = mv88e6131_phy_write, diff --git a/drivers/net/dsa/mv88e6171.c b/drivers/net/dsa/mv88e6171.c index 2c8eb6f..382529b 100644 --- a/drivers/net/dsa/mv88e6171.c +++ b/drivers/net/dsa/mv88e6171.c @@ -101,6 +101,7 @@ struct dsa_switch_driver mv88e6171_switch_driver = { .priv_size = sizeof(struct mv88e6xxx_priv_state), .probe = mv88e6171_probe, .setup = mv88e6171_setup, + .remove = mv88e6xxx_remove_common, .set_addr = mv88e6xxx_set_addr_indirect, .phy_read = mv88e6xxx_phy_read_indirect, .phy_write = mv88e6xxx_phy_write_indirect, diff --git a/drivers/net/dsa/mv88e6352.c b/drivers/net/dsa/mv88e6352.c index cbf4dd8..7938901 100644 --- a/drivers/net/dsa/mv88e6352.c +++ b/drivers/net/dsa/mv88e6352.c @@ -321,6 +321,7 @@ struct dsa_switch_driver mv88e6352_switch_driver = { .priv_size = sizeof(struct mv88e6xxx_priv_state), .probe = mv88e6352_probe, .setup = mv88e6352_setup, + .remove = mv88e6xxx_remove_common, .set_addr = mv88e6xxx_set_addr_indirect, .phy_read = mv88e6xxx_phy_read_indirect, .phy_write = mv88e6xxx_phy_write_indirect,