ethernet: ec_bhf: Remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Thu, 23 Mar 2023 09:03:07 +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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ec_bhf.c

index 46e3a05e95824842e116853c7dccd9ac1340c6ef..c2c5c589a5e329af4e3c5610122dea7289abbad1 100644 (file)
@@ -558,7 +558,6 @@ err_unmap:
 err_release_regions:
        pci_release_regions(dev);
 err_disable_dev:
-       pci_clear_master(dev);
        pci_disable_device(dev);
 
        return err;
@@ -577,7 +576,6 @@ static void ec_bhf_remove(struct pci_dev *dev)
        free_netdev(net_dev);
 
        pci_release_regions(dev);
-       pci_clear_master(dev);
        pci_disable_device(dev);
 }