From patchwork Mon Jan 12 21:57:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 428156 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 6CECB140161 for ; Tue, 13 Jan 2015 08:58:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752241AbbALV6E (ORCPT ); Mon, 12 Jan 2015 16:58:04 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:54831 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbbALV6C (ORCPT ); Mon, 12 Jan 2015 16:58:02 -0500 Received: by mail-pa0-f47.google.com with SMTP id kq14so34400585pab.6 for ; Mon, 12 Jan 2015 13:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mvBVm2NUfU9vOnymA7ALH6kPdSSODns1wC6gxoSiZY0=; b=MHol0JNExBkPDJAvqvH4SIvIan7TL4QLWaO13mP0B/6CKDXlyFjxq0eypuD1gIUL3P mjdHwyGSVa7+XdbtoCGZl51NY+rKc/Gmqct4NXvtbpTjMK7zE/JjlD9Y62RzY9yRbmCs k3LiYSdoVZnEGexpf5MgJbkpV5eKCawT2QFB7L5xhl5p3dwLa2CHhMh0g/MpLwEdBhjt 7QilQaPKFwK4Qp+gZ9i8v4dQi4JS3pURoVHLb42kc5rSHMNimb/VHDeE1WzwGzz3ti97 jyK1guDaq41joWaBrwhAVCxvz4TqV2crTo/Et4jSULqGd2DqwWj5OTbr78rGrBHqtwh4 HCdQ== X-Received: by 10.68.134.134 with SMTP id pk6mr47749000pbb.146.1421099881606; Mon, 12 Jan 2015 13:58:01 -0800 (PST) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id pf10sm15122207pbc.82.2015.01.12.13.58.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Jan 2015 13:58:00 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, buytenh@wantstofly.org, Florian Fainelli Subject: [PATCH net-next 7/8] net: dsa: bcm_sf2: cleanup resources in remove callback Date: Mon, 12 Jan 2015 13:57:45 -0800 Message-Id: <1421099866-3184-8-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421099866-3184-1-git-send-email-f.fainelli@gmail.com> References: <1421099866-3184-1-git-send-email-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Implement a remove callback allowing the switch driver to cleanup resources it used: interrupts and remapped register ranges. Signed-off-by: Florian Fainelli --- drivers/net/dsa/bcm_sf2.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 09f6b3cc1f66..a41b20c7d602 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -526,6 +526,25 @@ out_unmap: return ret; } +static void bcm_sf2_sw_remove(struct dsa_switch *ds) +{ + struct bcm_sf2_priv *priv = ds_to_priv(ds); + void __iomem **base; + unsigned int i; + + /* Disable all interrupts and free them */ + bcm_sf2_intr_disable(priv); + + free_irq(priv->irq0, priv); + free_irq(priv->irq1, priv); + + base = &priv->core; + for (i = 0; i < BCM_SF2_REGS_NUM; i++) { + iounmap(*base); + base++; + } +} + static int bcm_sf2_sw_set_addr(struct dsa_switch *ds, u8 *addr) { return 0; @@ -858,6 +877,7 @@ static struct dsa_switch_driver bcm_sf2_switch_driver = { .tag_protocol = DSA_TAG_PROTO_BRCM, .priv_size = sizeof(struct bcm_sf2_priv), .probe = bcm_sf2_sw_probe, + .remove = bcm_sf2_sw_remove, .setup = bcm_sf2_sw_setup, .set_addr = bcm_sf2_sw_set_addr, .get_phy_flags = bcm_sf2_sw_get_phy_flags,