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

net: liquidio: 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 4170f0ef

drivers/net/ethernet/cavium/liquidio/lio_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,6 @@ static void octeon_destroy_resources(struct octeon_device *oct) 


		fallthrough;

	case OCT_DEV_PCI_ENABLE_DONE:

		pci_clear_master(oct->pci_dev);

		/* Disable the device, releasing the PCI INT */

		pci_disable_device(oct->pci_dev);

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+0 −1
Original line number Diff line number Diff line
@@ -577,7 +577,6 @@ static void octeon_destroy_resources(struct octeon_device *oct) 


		fallthrough;

	case OCT_DEV_PCI_ENABLE_DONE:

		pci_clear_master(oct->pci_dev);

		/* Disable the device, releasing the PCI INT */

		pci_disable_device(oct->pci_dev);