Commit af54c459 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

Merge patch series "can: remove redundant pci_clear_master()" 

Cai Huoqing's series removes redundant pci_clear_master() to simplify
the code of multiple CAN drivers.

Link: https://lore.kernel.org/all/20230323113318.9473-1-cai.huoqing@linux.dev


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

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);

}

drivers/net/can/ctucanfd/ctucanfd_pci.c

+2 −6
Original line number Diff line number Diff line
@@ -206,10 +206,8 @@ static int ctucan_pci_probe(struct pci_dev *pdev, 
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);

drivers/net/can/kvaser_pciefd.c

+0 −1
Original line number Diff line number Diff line
@@ -1907,7 +1907,6 @@ static void kvaser_pciefd_remove(struct pci_dev *pdev) 


	free_irq(pcie->pci->irq, pcie);



	pci_clear_master(pdev);

	pci_iounmap(pdev, pcie->reg_base);

	pci_release_regions(pdev);

	pci_disable_device(pdev);