Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ntb_hw_amd: Remove redundant pci_clear_master

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>

authored by

Cai Huoqing and committed by
Jon Mason
da6b4dc4 cb2a6d17

-2
-2
drivers/ntb/hw/amd/ntb_hw_amd.c
··· 1194 1194 return 0; 1195 1195 1196 1196 err_dma_mask: 1197 - pci_clear_master(pdev); 1198 1197 pci_release_regions(pdev); 1199 1198 err_pci_regions: 1200 1199 pci_disable_device(pdev); ··· 1208 1209 1209 1210 pci_iounmap(pdev, ndev->self_mmio); 1210 1211 1211 - pci_clear_master(pdev); 1212 1212 pci_release_regions(pdev); 1213 1213 pci_disable_device(pdev); 1214 1214 pci_set_drvdata(pdev, NULL);