OSDN Git Service

wifi: ath10k: Remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Thu, 23 Mar 2023 11:26:10 +0000 (19:26 +0800)
committerKalle Valo <quic_kvalo@quicinc.com>
Wed, 12 Apr 2023 10:03:24 +0000 (13:03 +0300)
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 <cai.huoqing@linux.dev>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230323112613.7550-2-cai.huoqing@linux.dev
drivers/net/wireless/ath/ath10k/pci.c

index 728d607..a7f44f6 100644 (file)
@@ -3406,15 +3406,12 @@ static int ath10k_pci_claim(struct ath10k *ar)
        if (!ar_pci->mem) {
                ath10k_err(ar, "failed to iomap BAR%d\n", BAR_NUM);
                ret = -EIO;
-               goto err_master;
+               goto err_region;
        }
 
        ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot pci_mem 0x%pK\n", ar_pci->mem);
        return 0;
 
-err_master:
-       pci_clear_master(pdev);
-
 err_region:
        pci_release_region(pdev, BAR_NUM);
 
@@ -3431,7 +3428,6 @@ static void ath10k_pci_release(struct ath10k *ar)
 
        pci_iounmap(pdev, ar_pci->mem);
        pci_release_region(pdev, BAR_NUM);
-       pci_clear_master(pdev);
        pci_disable_device(pdev);
 }