Commit 248ed9e2 authored by Cai Huoqing's avatar Cai Huoqing Committed by Oded Gabbay
Browse files

accel/habanalabs: 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: default avatarCai Huoqing <cai.huoqing@linux.dev>
Reviewed-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 4d877b1a

drivers/accel/habanalabs/common/device.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/accel/habanalabs/common/pci/pci.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

}