accel/habanalabs: Remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Thu, 23 Mar 2023 08:35:49 +0000 (16:35 +0800)
committerOded Gabbay <ogabbay@kernel.org>
Sat, 8 Apr 2023 07:39:33 +0000 (10:39 +0300)
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>
Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
drivers/accel/habanalabs/common/device.c
drivers/accel/habanalabs/common/pci/pci.c

index 7130059..2fb1e2e 100644 (file)
@@ -1271,7 +1271,6 @@ int hl_device_resume(struct hl_device *hdev)
        return 0;
 
 disable_device:
-       pci_clear_master(hdev->pdev);
        pci_disable_device(hdev->pdev);
 
        return rc;
index d1f4c69..191e0e3 100644 (file)
@@ -420,7 +420,6 @@ int hl_pci_init(struct hl_device *hdev)
 unmap_pci_bars:
        hl_pci_bars_unmap(hdev);
 disable_device:
-       pci_clear_master(pdev);
        pci_disable_device(pdev);
 
        return rc;
@@ -436,6 +435,5 @@ void hl_pci_fini(struct hl_device *hdev)
 {
        hl_pci_bars_unmap(hdev);
 
-       pci_clear_master(hdev->pdev);
        pci_disable_device(hdev->pdev);
 }