From patchwork Thu Mar 23 11:26:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cai Huoqing X-Patchwork-Id: 74024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2864256wrt; Thu, 23 Mar 2023 04:57:29 -0700 (PDT) X-Google-Smtp-Source: AK7set/EVDJtxLahDPH23CrpZyRx6+y1N8IBPGV8KFOssfith6tA/w4LnknqRZF56fOjDHKym7cP X-Received: by 2002:a17:902:f68c:b0:19a:bbd0:c5ca with SMTP id l12-20020a170902f68c00b0019abbd0c5camr7832563plg.48.1679572649671; Thu, 23 Mar 2023 04:57:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679572649; cv=none; d=google.com; s=arc-20160816; b=Nrm6ldTDPbQ+NRnuGDIi+zO8avYdh8BzVJQK/hIlkzJtgg4cYl5UhJDrd0EdtKBdO5 v32btQbaPkzWVt2nyrPrh4xmbxmQnwXkVsyErDy0lbcHvhdQkB+Qg+8wt+C542knBQfq IaNWnzJ7wUa/xiZSHfD363jukcHYidkuBhN9aGhxZIsL05iV8j9BwoZvDBRSraec/Ow9 sm+mVBvg3LmIjLrFOl40+eMXKKEZo221+ZCSuMyeD20754F+q2mEq9x+gKQHBIMsg61D 7wEGIHIjE5l8GMVI2G6GVOgAkSIjRPDl7IaDXztMGvlgYfU4HmLdPAoFgRFmJtjCXchI Xw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=rFrZeFL95bAADeoxTVP7Nzd5sq/6QShfuHH0D38gefI=; b=SZ9jiwp/EPZjPVFVGuaQ6qjhfoszdsGXbW/CJ/3WnrLU52ARNaKnKcgF2BgToul9gI dPGV+JrVMx/MvANh1idUzhe0Wz3HWUYcrIfYK6aJI9BTdoGvaHP5vJPStvB4m4pCEQaU k495C1BaB58nf+EJX2PIvvikMtQ5q32RMY/4pwjR7QgeIDD/lEV+pvGo/Twhb8UylKe1 M+4SiPr9S8K9KDxQGPMJAV+KkOjgswrTtVzjP4ajVXGkj6qSMNS3NXVnI4FtkF0QkqQr IJybyjHlKpxRZZVA5IV+rXEAIDWnurfdzpAEcZv4USFQJ+cWvfMqnC+Vmgs9ElrEgOUV ffYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=iieSNHbL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l17-20020a170903245100b001a1c7fe5bccsi12978718pls.248.2023.03.23.04.57.16; Thu, 23 Mar 2023 04:57:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=iieSNHbL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230072AbjCWL0c (ORCPT + 99 others); Thu, 23 Mar 2023 07:26:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230499AbjCWL03 (ORCPT ); Thu, 23 Mar 2023 07:26:29 -0400 Received: from out-23.mta1.migadu.com (out-23.mta1.migadu.com [95.215.58.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0CDB2DE43 for ; Thu, 23 Mar 2023 04:26:24 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1679570783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rFrZeFL95bAADeoxTVP7Nzd5sq/6QShfuHH0D38gefI=; b=iieSNHbLTfna/AJWw4ifxYEls++cBF9dlNm9peQh4RNpnr/S41QQfmoR6P1mfO93mmDEm/ sUOXphPRjd2lfzh8OKjD0eTzs73xofcjuI6u/1+T2KsrkL9xXCatCQFGOu976gs0BeEbgp oYmUYiuMI5+e3DM0+fDsGgf8JSQ62BM= From: Cai Huoqing To: cai.huoqing@linux.dev Cc: Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yan-Hsuan Chuang , Ping-Ke Shih , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org Subject: [PATCH 1/5] wifi: ath11k: Remove redundant pci_clear_master Date: Thu, 23 Mar 2023 19:26:09 +0800 Message-Id: <20230323112613.7550-1-cai.huoqing@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS,TO_EQ_FM_DIRECT_MX autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761159570622205224?= X-GMAIL-MSGID: =?utf-8?q?1761159570622205224?= Remove pci_clear_master to simplify the code, the bus-mastering is also cleared in do_pci_disable_device, like this: ./drivers/pci/pci.c:2197 static void do_pci_disable_device(struct pci_dev *dev) { u16 pci_command; pci_read_config_word(dev, PCI_COMMAND, &pci_command); if (pci_command & PCI_COMMAND_MASTER) { pci_command &= ~PCI_COMMAND_MASTER; pci_write_config_word(dev, PCI_COMMAND, pci_command); } pcibios_disable_device(dev); }. And dev->is_busmaster is set to 0 in pci_disable_device. Signed-off-by: Cai Huoqing Reviewed-by: Simon Horman --- drivers/net/wireless/ath/ath11k/pci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c index 0aeef2948ff5..522d01e5e11c 100644 --- a/drivers/net/wireless/ath/ath11k/pci.c +++ b/drivers/net/wireless/ath/ath11k/pci.c @@ -540,7 +540,7 @@ static int ath11k_pci_claim(struct ath11k_pci *ab_pci, struct pci_dev *pdev) if (!ab->mem) { ath11k_err(ab, "failed to map pci bar %d\n", ATH11K_PCI_BAR_NUM); ret = -EIO; - goto clear_master; + goto release_region; } ab->mem_ce = ab->mem; @@ -548,8 +548,6 @@ static int ath11k_pci_claim(struct ath11k_pci *ab_pci, struct pci_dev *pdev) ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot pci_mem 0x%pK\n", ab->mem); return 0; -clear_master: - pci_clear_master(pdev); release_region: pci_release_region(pdev, ATH11K_PCI_BAR_NUM); disable_device: @@ -565,7 +563,6 @@ static void ath11k_pci_free_region(struct ath11k_pci *ab_pci) pci_iounmap(pci_dev, ab->mem); ab->mem = NULL; - pci_clear_master(pci_dev); pci_release_region(pci_dev, ATH11K_PCI_BAR_NUM); if (pci_is_enabled(pci_dev)) pci_disable_device(pci_dev);