Skip to contentSkip to conversation

RDMA/usnic: Remove redundant pci_clear_master

PATCH Applied Cai Huoqing 2 participants 2 messages Mar 23, 2023 – Mar 29, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA/usnic: 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.

---
 drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 --
 1 file changed, 2 deletions(-)
drivers/infiniband/hw/usnic/usnic_ib_main.c +0 -2
index 46653ad56f5a..13b654ddd3cc 100644
@@ -602,7 +602,6 @@ static int usnic_ib_pci_probe(struct pci_dev *pdev,
 	usnic_vnic_free(vf->vnic);
 out_release_regions:
 	pci_set_drvdata(pdev, NULL);
-	pci_clear_master(pdev);
 	pci_release_regions(pdev);
 out_disable_device:
 	pci_disable_device(pdev);
@@ -623,7 +622,6 @@ static void usnic_ib_pci_remove(struct pci_dev *pdev)
 	kref_put(&pf->vf_cnt, usnic_ib_undiscover_pf);
 	usnic_vnic_free(vf->vnic);
 	pci_set_drvdata(pdev, NULL);
-	pci_clear_master(pdev);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
 	kfree(vf);
Signature · 1 line
2.34.1
#1 lore raw
Quoted 9 lines · Cai Huoqing

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;

[...]

Applied, thanks!

[1/1] RDMA/usnic: Remove redundant pci_clear_master

      https://git.kernel.org/rdma/rdma/c/fc36ce35e94585

Best regards,

Signature · 1 line
Leon Romanovsky <[email protected]>