mirror of
https://github.com/torvalds/linux.git
synced 2026-06-05 04:56:13 +02:00
net: liquidio: 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: Cai Huoqing <cai.huoqing@linux.dev>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4170f0ef58
commit
fc5aba60c2
|
|
@ -1129,7 +1129,6 @@ static void octeon_destroy_resources(struct octeon_device *oct)
|
|||
|
||||
fallthrough;
|
||||
case OCT_DEV_PCI_ENABLE_DONE:
|
||||
pci_clear_master(oct->pci_dev);
|
||||
/* Disable the device, releasing the PCI INT */
|
||||
pci_disable_device(oct->pci_dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -577,7 +577,6 @@ static void octeon_destroy_resources(struct octeon_device *oct)
|
|||
|
||||
fallthrough;
|
||||
case OCT_DEV_PCI_ENABLE_DONE:
|
||||
pci_clear_master(oct->pci_dev);
|
||||
/* Disable the device, releasing the PCI INT */
|
||||
pci_disable_device(oct->pci_dev);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user