mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
can: ctucanfd: 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: Cai Huoqing <cai.huoqing@linux.dev> Link: https://lore.kernel.org/all/20230323113318.9473-2-cai.huoqing@linux.dev Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
594503341d
commit
c9d23f9657
1 changed files with 2 additions and 6 deletions
|
@ -206,10 +206,8 @@ static int ctucan_pci_probe(struct pci_dev *pdev,
|
||||||
err_pci_iounmap_bar1:
|
err_pci_iounmap_bar1:
|
||||||
pci_iounmap(pdev, addr);
|
pci_iounmap(pdev, addr);
|
||||||
err_release_regions:
|
err_release_regions:
|
||||||
if (msi_ok) {
|
if (msi_ok)
|
||||||
pci_disable_msi(pdev);
|
pci_disable_msi(pdev);
|
||||||
pci_clear_master(pdev);
|
|
||||||
}
|
|
||||||
pci_release_regions(pdev);
|
pci_release_regions(pdev);
|
||||||
err_disable_device:
|
err_disable_device:
|
||||||
pci_disable_device(pdev);
|
pci_disable_device(pdev);
|
||||||
|
@ -257,10 +255,8 @@ static void ctucan_pci_remove(struct pci_dev *pdev)
|
||||||
|
|
||||||
pci_iounmap(pdev, bdata->bar1_base);
|
pci_iounmap(pdev, bdata->bar1_base);
|
||||||
|
|
||||||
if (bdata->use_msi) {
|
if (bdata->use_msi)
|
||||||
pci_disable_msi(pdev);
|
pci_disable_msi(pdev);
|
||||||
pci_clear_master(pdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
pci_release_regions(pdev);
|
pci_release_regions(pdev);
|
||||||
pci_disable_device(pdev);
|
pci_disable_device(pdev);
|
||||||
|
|
Loading…
Reference in a new issue