From patchwork Wed Oct 28 14:13: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: 537347 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 75265141304 for ; Thu, 29 Oct 2015 01:14:55 +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=fjmTf99s; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966230AbbJ1OOv (ORCPT ); Wed, 28 Oct 2015 10:14:51 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:35449 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966316AbbJ1ONP (ORCPT ); Wed, 28 Oct 2015 10:13:15 -0400 Received: by wicll6 with SMTP id ll6so200018190wic.0 for ; Wed, 28 Oct 2015 07:13:13 -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=AQP6M4shn9DdHN//tXg5t/U3XF5mi0kfq27UrZ7zUxo=; b=fjmTf99skjlQcYZSBguEL9XDSRwoCwO3Z5Ds5KxEPfeUHvoYBELqkRPh2MVk1nHc/l C7sjS0/KvhfUWfUwRsi3F1GSeR3F0EwOiEi7ltI97ZldpSUD44noTktlwrY1sJYjKTQ0 wErvs7RKO2OlitsjxD4UX3I9vSz2JoGpVhjnFGWuXb6X1/BnekQ/P0ekuiKFfLs5nclJ INW2tguGHWYvHbM3cFVMJHXiS9R6AbP5xFeLLJSQsbf3TBsvzdmffRqYXiJy0lApYXW0 HCJPGZeNBX1YaasSaaX2boZg2x0kAY+fvvSHDrN1eAH4gAM+gTC23gJlLiMymfXOgzf6 C2lg== 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=AQP6M4shn9DdHN//tXg5t/U3XF5mi0kfq27UrZ7zUxo=; b=cGoC4XcE3gEFmDD0ogP/RQXqkKa7ICrbJW4m8XLWy0IcW/3n5XNBRHkhjjuQoFn58f 5oGQMhvcs5AMQzm695cD10d6VgjJyxXAl6tyil66HMIb6SPU4fvvjO7TnxfxNo3aK1HR 0sFgH0APucevVfxH2pT9j5H+CjwlDlBX4FFccCEuW8kzKd+Z92Uwj0BgqYVtU4ZM65qU uuRg5FBAzg5qYmhIoL4tN+0PlSruvX8gtfBvCA38BcTVXlA3woEmZ94qnas344e2k8Q5 KORWi8NDl4N4MhX2lPqtguWcVBTzkrburcQJBPTOKgAlUqbMBxMEMHHFD4dmTHrY75fD XmPA== X-Gm-Message-State: ALoCoQnby5kIrwnF2y1bvhdZkjsbUFZ4u2FbEb7ubf1UouNGZ5Qo9IzZVHHEtAK2wY//MIXZzO+y X-Received: by 10.180.149.211 with SMTP id uc19mr3162107wib.50.1446041593663; Wed, 28 Oct 2015 07:13:13 -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 fp6sm9819907wib.9.2015.10.28.07.13.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Oct 2015 07:13:13 -0700 (PDT) From: Neil Armstrong Subject: [RFC PATCH v2 2/4] net: dsa: bcm_sf2: cleanup resources in remove callback 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: <5630D7F3.2000508@baylibre.com> Date: Wed, 28 Oct 2015 15:13: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 Implement a remove callback allowing the switch driver to cleanup resources it used: interrupts and remapped register ranges. Signed-off-by: Florian Fainelli Signed-off-by: Neil Armstrong --- 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 6f946fe..e0be318 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -1054,6 +1054,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; @@ -1367,6 +1386,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,