rapidio/tsi721: remove redundant pci_clear_master
authorCai Huoqing <cai.huoqing@linux.dev>
Thu, 23 Mar 2023 11:37:09 +0000 (19:37 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Sat, 8 Apr 2023 20:45:38 +0000 (13:45 -0700)
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.

Link: https://lkml.kernel.org/r/20230323113711.10523-1-cai.huoqing@linux.dev
Signed-off-by: Cai Huoqing <cai.huoqing@linux.dev>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/rapidio/devices/tsi721.c

index 0a42d6a2af24f95878efbf41a74889894737b5d3..83323c3d10aff7036fa51026c6f93f5f2c3252de 100644 (file)
@@ -2924,7 +2924,6 @@ err_unmap_bars:
                iounmap(priv->odb_base);
 err_free_res:
        pci_release_regions(pdev);
-       pci_clear_master(pdev);
 err_disable_pdev:
        pci_disable_device(pdev);
 err_clean:
@@ -2962,7 +2961,6 @@ static void tsi721_remove(struct pci_dev *pdev)
                pci_disable_msi(priv->pdev);
 #endif
        pci_release_regions(pdev);
-       pci_clear_master(pdev);
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);
        kfree(priv);
@@ -2977,7 +2975,6 @@ static void tsi721_shutdown(struct pci_dev *pdev)
 
        tsi721_disable_ints(priv);
        tsi721_dma_stop_all(priv);
-       pci_clear_master(pdev);
        pci_disable_device(pdev);
 }