Commit 3228150b authored by Cai Huoqing's avatar Cai Huoqing Committed by David S. Miller

ethernet: ec_bhf: 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 f686e959
...@@ -558,7 +558,6 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id) ...@@ -558,7 +558,6 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)
err_release_regions: err_release_regions:
pci_release_regions(dev); pci_release_regions(dev);
err_disable_dev: err_disable_dev:
pci_clear_master(dev);
pci_disable_device(dev); pci_disable_device(dev);
return err; return err;
...@@ -577,7 +576,6 @@ static void ec_bhf_remove(struct pci_dev *dev) ...@@ -577,7 +576,6 @@ static void ec_bhf_remove(struct pci_dev *dev)
free_netdev(net_dev); free_netdev(net_dev);
pci_release_regions(dev); pci_release_regions(dev);
pci_clear_master(dev);
pci_disable_device(dev); pci_disable_device(dev);
} }
......
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