Skip to content

Commit d353fb4

Browse files
caihuoqjonmason
authored andcommitted
ntb: intel: 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> Acked-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Jon Mason <jdmason@kudzu.us>
1 parent f2748c6 commit d353fb4

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/ntb/hw/intel/ntb_hw_gen1.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,7 +1791,6 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
17911791

17921792
err_mmio:
17931793
err_dma_mask:
1794-
pci_clear_master(pdev);
17951794
pci_release_regions(pdev);
17961795
err_pci_regions:
17971796
pci_disable_device(pdev);
@@ -1808,7 +1807,6 @@ static void intel_ntb_deinit_pci(struct intel_ntb_dev *ndev)
18081807
pci_iounmap(pdev, ndev->peer_mmio);
18091808
pci_iounmap(pdev, ndev->self_mmio);
18101809

1811-
pci_clear_master(pdev);
18121810
pci_release_regions(pdev);
18131811
pci_disable_device(pdev);
18141812
pci_set_drvdata(pdev, NULL);

0 commit comments

Comments
 (0)