Skip to content

Commit f2748c6

Browse files
caihuoqjonmason
authored andcommitted
ntb: epf: 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>
1 parent da6b4dc commit f2748c6

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

drivers/ntb/hw/epf/ntb_hw_epf.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -591,22 +591,22 @@ static int ntb_epf_init_pci(struct ntb_epf_dev *ndev,
591591
ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
592592
if (ret) {
593593
dev_err(dev, "Cannot set DMA mask\n");
594-
goto err_dma_mask;
594+
goto err_pci_regions;
595595
}
596596
dev_warn(&pdev->dev, "Cannot DMA highmem\n");
597597
}
598598

599599
ndev->ctrl_reg = pci_iomap(pdev, ndev->ctrl_reg_bar, 0);
600600
if (!ndev->ctrl_reg) {
601601
ret = -EIO;
602-
goto err_dma_mask;
602+
goto err_pci_regions;
603603
}
604604

605605
if (ndev->peer_spad_reg_bar) {
606606
ndev->peer_spad_reg = pci_iomap(pdev, ndev->peer_spad_reg_bar, 0);
607607
if (!ndev->peer_spad_reg) {
608608
ret = -EIO;
609-
goto err_dma_mask;
609+
goto err_pci_regions;
610610
}
611611
} else {
612612
spad_sz = 4 * readl(ndev->ctrl_reg + NTB_EPF_SPAD_COUNT);
@@ -617,14 +617,11 @@ static int ntb_epf_init_pci(struct ntb_epf_dev *ndev,
617617
ndev->db_reg = pci_iomap(pdev, ndev->db_reg_bar, 0);
618618
if (!ndev->db_reg) {
619619
ret = -EIO;
620-
goto err_dma_mask;
620+
goto err_pci_regions;
621621
}
622622

623623
return 0;
624624

625-
err_dma_mask:
626-
pci_clear_master(pdev);
627-
628625
err_pci_regions:
629626
pci_disable_device(pdev);
630627

@@ -642,7 +639,6 @@ static void ntb_epf_deinit_pci(struct ntb_epf_dev *ndev)
642639
pci_iounmap(pdev, ndev->peer_spad_reg);
643640
pci_iounmap(pdev, ndev->db_reg);
644641

645-
pci_clear_master(pdev);
646642
pci_release_regions(pdev);
647643
pci_disable_device(pdev);
648644
pci_set_drvdata(pdev, NULL);

0 commit comments

Comments
 (0)