net: mana: Remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Thu, 23 Mar 2023 09:03:05 +0000 (17:03 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Mar 2023 09:09:27 +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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/microsoft/mana/gdma_main.c

index f9b8f372ec8a744e246b1f43fa513e9c115c5f6a..8f3f78b6859221c587520b5e11658edf8a232ced 100644 (file)
@@ -1439,7 +1439,6 @@ free_gc:
 release_region:
        pci_release_regions(pdev);
 disable_dev:
-       pci_clear_master(pdev);
        pci_disable_device(pdev);
        dev_err(&pdev->dev, "gdma probe failed: err = %d\n", err);
        return err;
@@ -1458,7 +1457,6 @@ static void mana_gd_remove(struct pci_dev *pdev)
        vfree(gc);
 
        pci_release_regions(pdev);
-       pci_clear_master(pdev);
        pci_disable_device(pdev);
 }