From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68744C004C9 for ; Sun, 5 May 2019 15:17:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 129D5208C2 for ; Sun, 5 May 2019 15:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557069429; bh=NGhq3lbHAvY4MqEIotn35c7uRMvT5Y+NLTPhUXTmf1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YmwAh45zuenIVB9DYQZQutcoiP1KO8tXkyLc1UtmV8metVUKBBCyt8FgbhSASp9gQ Zdpdblm2nF6CJ9mjSScFpgGgh6LBZtB8d4ytsIVmbhCSitFKwEe3V8qBKHdTttlPbR JJooHLrOUDUzmiSCn65aGa8nBB0nipTiAfCE0t7E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727860AbfEEPRI (ORCPT ); Sun, 5 May 2019 11:17:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:35174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727816AbfEEPRI (ORCPT ); Sun, 5 May 2019 11:17:08 -0400 Received: from lore-desk-wlan.lan (unknown [151.66.59.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4C705208C0; Sun, 5 May 2019 15:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557069427; bh=NGhq3lbHAvY4MqEIotn35c7uRMvT5Y+NLTPhUXTmf1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mAfxqD6jOZLnpROF1bzESk15jlj/v2Z3411v7I8LKFrv+7ib8yeXPap9UUdNbVG8O 61y67kagAy/9ah6XTwajeyyWMqshzI5CnwEM2Ah5FXjJCulVs1eLsZR8j7Tc5k+1t9 648eQ+nn/CCLxCelJmEi2BkInuftC80jdO1FaD2k= From: Lorenzo Bianconi To: nbd@nbd.name Cc: lorenzo.bianconi@redhat.com, linux-wireless@vger.kernel.org, ryder.lee@mediatek.com, royluo@google.com Subject: [PATCH] mt76: mt7615: rearrange cleanup operations in mt7615_unregister_device Date: Sun, 5 May 2019 17:17:00 +0200 Message-Id: <2523f264daef250a141d8047f5f92a60ac6acc69.1557059004.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Cleanup tx/rx napi before releasing pending idrs. Moreover unmap txwi_cache running mt76_free_device routine Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c index 3ab3ff553ef2..59f604f3161f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c @@ -212,6 +212,10 @@ void mt7615_unregister_device(struct mt7615_dev *dev) struct mt76_txwi_cache *txwi; int id; + mt76_unregister_device(&dev->mt76); + mt7615_dma_cleanup(dev); + mt7615_mcu_exit(dev); + spin_lock_bh(&dev->token_lock); idr_for_each_entry(&dev->token, txwi, id) { mt7615_txp_skb_unmap(&dev->mt76, txwi); @@ -221,9 +225,6 @@ void mt7615_unregister_device(struct mt7615_dev *dev) } spin_unlock_bh(&dev->token_lock); idr_destroy(&dev->token); - mt76_unregister_device(&dev->mt76); - mt7615_mcu_exit(dev); - mt7615_dma_cleanup(dev); - ieee80211_free_hw(mt76_hw(dev)); + mt76_free_device(&dev->mt76); } -- 2.20.1