net/mlx5: Remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Thu, 23 Mar 2023 09:03:04 +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/mellanox/mlx5/core/main.c

index d39c3476b6d14cd0a74426bd44fe35ab53536894..597174ceadc9211bd131fa8af5b2aec4e6479c78 100644 (file)
@@ -918,7 +918,6 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct pci_dev *pdev,
        return 0;
 
 err_clr_master:
-       pci_clear_master(dev->pdev);
        release_bar(dev->pdev);
 err_disable:
        mlx5_pci_disable_device(dev);
@@ -933,7 +932,6 @@ static void mlx5_pci_close(struct mlx5_core_dev *dev)
         */
        mlx5_drain_health_wq(dev);
        iounmap(dev->iseg);
-       pci_clear_master(dev->pdev);
        release_bar(dev->pdev);
        mlx5_pci_disable_device(dev);
 }