diff options
| author | Cai Huoqing <cai.huoqing@linux.dev> | 2023-03-24 09:32:18 +0800 |
|---|---|---|
| committer | Jon Mason <jdmason@kudzu.us> | 2023-07-08 11:02:37 -0400 |
| commit | da6b4dc49e3c10e13adfb79fc41c098bacf1dc09 (patch) | |
| tree | 1517b6fd5284b1cc431d7264e677a106cdd17c8b /drivers/ntb | |
| parent | cb2a6d17353452e893194ce1b4e2699fcb24b955 (diff) | |
| download | linux-da6b4dc49e3c10e13adfb79fc41c098bacf1dc09.tar.gz linux-da6b4dc49e3c10e13adfb79fc41c098bacf1dc09.tar.bz2 linux-da6b4dc49e3c10e13adfb79fc41c098bacf1dc09.zip | |
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>
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/hw/amd/ntb_hw_amd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c index 730f2103b91d..855ff65f64a5 100644 --- a/drivers/ntb/hw/amd/ntb_hw_amd.c +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c @@ -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); |