Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp6160115yba; Wed, 1 May 2019 07:08:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqx90ryoKEuTnvA6p5k4bKtzFaUMhh1/eEerT3m51sGyQ79YyIh+wXweka1QsOs/kTYkue8I X-Received: by 2002:a17:902:e305:: with SMTP id cg5mr30842005plb.112.1556719681011; Wed, 01 May 2019 07:08:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556719681; cv=none; d=google.com; s=arc-20160816; b=uGevtMlqqAGiNtxWT981ueAUlqKqX8O9CJopP6wvk3Z++OK0ylmbwNO6XWG1nFDwmP GvAo6/CjSdevfGvdyXOccnsYR5p+Bwuj5vEaZ4X+ExR23OV503AsVzyj0yY4WVGzBwD0 eTDYqh+tXcxz6PYlQ1yJhEEtO+xnwu2vP2sChr4f1kCSX65YRF6+fho/TO2VGsWRpibY 2u2lUy9/qnoAffqGbLwAbIJcwXl2kCtPBifTTmWLcRZ44PWhGCXQPeraElaQIqihRUPO sXKwGUwZS8F3YzW9Q2UtZvFwPgiAzQlOeKqI+fNBZv60V60V1f3PudD5dMep7Da1yCgA ZOxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JRTEllWZ7CQFwheLku1V+ykHPyHve+jXgoQ8fZwFlC4=; b=q5/joWKryL0wCcIFvJugT8BztIoOC+JwScMmQxuSsp+OtQqQzlab4panRzVeoCPgxm Hs2d9FiRM696GDLypwOsdErKnldUR1YIY7glZbHNnjnycclHR+23hvWHcNaHkUCEgIYE seyLIXCW0/gfYxYJLPqtd41fk1Zn537h3dL6AFwY3p7CC36Bmx/OMuPSSfgZWnfDpU/M MgEbMLOubBgtN105W7U5QEbFJzeHCXwXO4UF/t+qjb2RQvNlcioUk3KyZgq8iWeo6XBh UzzR6DEwWvjX4RBIb43rqwKcGhpb8d2rcxjxFbpg73k+MBYf6J3V3C5zSTKv6wSHkirn DQfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J+cHBosz; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p2si24882623pls.31.2019.05.01.07.07.45; Wed, 01 May 2019 07:08:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J+cHBosz; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726620AbfEAOGh (ORCPT + 99 others); Wed, 1 May 2019 10:06:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:34670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726382AbfEAOGh (ORCPT ); Wed, 1 May 2019 10:06:37 -0400 Received: from localhost.localdomain (unknown [151.66.22.155]) (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 5CDFA2177B; Wed, 1 May 2019 14:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556719596; bh=mgtc3MOin15I+yHRQaZ5sR0wyjYRiNmVDrijmmulnWI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J+cHBoszSzbf6XIgzGArT5BXfyaBWH5FaqcsgOvgBvOu4EwTlf1JtowuyGp5pOeU4 8l/cQThP60d7CLds0VDoZW0dvSaeoUyRYLKsh7zLrZG515kR4esRxDINH1Jq2NjCJy sDN60x07VMwX4gy6mV8znQj5erzSjGBTYfP4+cKI= From: Lorenzo Bianconi To: nbd@nbd.name Cc: lorenzo.bianconi@redhat.com, linux-wireless@vger.kernel.org, ryder.lee@mediatek.com Subject: [PATCH 4/4] mt76: move netif_napi_del in mt76_dma_cleanup Date: Wed, 1 May 2019 16:06:23 +0200 Message-Id: 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 Move netif_napi_del in mt76_dma_cleanup routine since it is done by all drivers Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/dma.c | 1 + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 1 - drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 1 - drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c index 4381155375e1..d8f61e540bfd 100644 --- a/drivers/net/wireless/mediatek/mt76/dma.c +++ b/drivers/net/wireless/mediatek/mt76/dma.c @@ -588,6 +588,7 @@ void mt76_dma_cleanup(struct mt76_dev *dev) { int i; + netif_napi_del(&dev->tx_napi); for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++) mt76_dma_tx_cleanup(dev, i, true); diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c index 54314f6803c5..58dc511f93c5 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c @@ -250,6 +250,5 @@ void mt7603_dma_cleanup(struct mt7603_dev *dev) MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE); tasklet_kill(&dev->mt76.tx_tasklet); - netif_napi_del(&dev->mt76.tx_napi); mt76_dma_cleanup(&dev->mt76); } diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c index 9c565c93988a..6a70273d4a69 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c @@ -220,6 +220,5 @@ void mt7615_dma_cleanup(struct mt7615_dev *dev) mt76_set(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_SW_RESET); tasklet_kill(&dev->mt76.tx_tasklet); - netif_napi_del(&dev->mt76.tx_napi); mt76_dma_cleanup(&dev->mt76); } diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c index 617934565818..467b28379870 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c @@ -335,7 +335,6 @@ static void mt76x02_dma_enable(struct mt76x02_dev *dev) void mt76x02_dma_cleanup(struct mt76x02_dev *dev) { tasklet_kill(&dev->mt76.tx_tasklet); - netif_napi_del(&dev->mt76.tx_napi); mt76_dma_cleanup(&dev->mt76); } EXPORT_SYMBOL_GPL(mt76x02_dma_cleanup); -- 2.20.1