can: ctucanfd: Remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Thu, 23 Mar 2023 11:33:16 +0000 (19:33 +0800)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 24 Mar 2023 18:11:20 +0000 (19:11 +0100)
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>
drivers/net/can/ctucanfd/ctucanfd_pci.c

index 8f2956a..9da09e7 100644 (file)
@@ -206,10 +206,8 @@ err_pci_iounmap_bar0:
 err_pci_iounmap_bar1:
        pci_iounmap(pdev, addr);
 err_release_regions:
-       if (msi_ok) {
+       if (msi_ok)
                pci_disable_msi(pdev);
-               pci_clear_master(pdev);
-       }
        pci_release_regions(pdev);
 err_disable_device:
        pci_disable_device(pdev);
@@ -257,10 +255,8 @@ static void ctucan_pci_remove(struct pci_dev *pdev)
 
        pci_iounmap(pdev, bdata->bar1_base);
 
-       if (bdata->use_msi) {
+       if (bdata->use_msi)
                pci_disable_msi(pdev);
-               pci_clear_master(pdev);
-       }
 
        pci_release_regions(pdev);
        pci_disable_device(pdev);