ionic: Remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Thu, 23 Mar 2023 09:03:06 +0000 (17:03 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Mar 2023 09:09:28 +0000 (09:09 +0000)
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>
Acked-by: Shannon Nelson <shannon.nelson@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c

index e508f8eb43bf8156ba7972bd8498f6eca09d167a..b8678da1cce528ed8029db44e0fa1c39342775cb 100644 (file)
@@ -392,7 +392,6 @@ static void ionic_remove(struct pci_dev *pdev)
        ionic_port_reset(ionic);
        ionic_reset(ionic);
        ionic_dev_teardown(ionic);
-       pci_clear_master(pdev);
        ionic_unmap_bars(ionic);
        pci_release_regions(pdev);
        pci_disable_device(pdev);