Commit 2d59af83 authored by Cai Huoqing's avatar Cai Huoqing Committed by David S. Miller

net: mana: 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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b6f4bd2
...@@ -1439,7 +1439,6 @@ static int mana_gd_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1439,7 +1439,6 @@ static int mana_gd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
release_region: release_region:
pci_release_regions(pdev); pci_release_regions(pdev);
disable_dev: disable_dev:
pci_clear_master(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
dev_err(&pdev->dev, "gdma probe failed: err = %d\n", err); dev_err(&pdev->dev, "gdma probe failed: err = %d\n", err);
return err; return err;
...@@ -1458,7 +1457,6 @@ static void mana_gd_remove(struct pci_dev *pdev) ...@@ -1458,7 +1457,6 @@ static void mana_gd_remove(struct pci_dev *pdev)
vfree(gc); vfree(gc);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_clear_master(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment