Commit 59450334 authored by Cai Huoqing's avatar Cai Huoqing Committed by Marc Kleine-Budde
Browse files

can: c_can: 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>
Link: https://lore.kernel.org/all/20230323113318.9473-1-cai.huoqing@linux.dev


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent f6b53d1b

drivers/net/can/c_can/c_can_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ static int c_can_pci_probe(struct pci_dev *pdev, 
	pci_iounmap(pdev, addr);

out_release_regions:

	pci_disable_msi(pdev);

	pci_clear_master(pdev);

	pci_release_regions(pdev);

out_disable_device:

	pci_disable_device(pdev);
@@ -247,7 +246,6 @@ static void c_can_pci_remove(struct pci_dev *pdev) 


	pci_iounmap(pdev, addr);

	pci_disable_msi(pdev);

	pci_clear_master(pdev);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

}