Commit 5b6f4bd2 authored by Cai Huoqing's avatar Cai Huoqing Committed by David S. Miller
Browse files

net/mlx5: 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: default avatarCai Huoqing <cai.huoqing@linux.dev>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b91d5b6

drivers/net/ethernet/mellanox/mlx5/core/main.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

}