]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ntb_hw_amd: Remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Fri, 24 Mar 2023 01:32:18 +0000 (09:32 +0800)
committerJon Mason <jdmason@kudzu.us>
Sat, 8 Jul 2023 15:02:37 +0000 (11:02 -0400)
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: Jon Mason <jdmason@kudzu.us>
drivers/ntb/hw/amd/ntb_hw_amd.c

index 730f2103b91d1d5186a694431d826bd3e1ed667b..855ff65f64a5a3737e992eb3ee386b98f8d04349 100644 (file)
@@ -1194,7 +1194,6 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,
        return 0;
 
 err_dma_mask:
-       pci_clear_master(pdev);
        pci_release_regions(pdev);
 err_pci_regions:
        pci_disable_device(pdev);
@@ -1209,7 +1208,6 @@ static void amd_ntb_deinit_pci(struct amd_ntb_dev *ndev)
 
        pci_iounmap(pdev, ndev->self_mmio);
 
-       pci_clear_master(pdev);
        pci_release_regions(pdev);
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);