Commit cfd67903 authored by Sean Anderson's avatar Sean Anderson Committed by Bjorn Helgaas
Browse files

PCI: xilinx-nwl: Clean up clock on probe failure/removal 

Make sure we turn off the clock on probe failure and device removal.

Fixes: de0a01f5 ("PCI: xilinx-nwl: Enable the clock through CCF")
Link: https://lore.kernel.org/r/20240531161337.864994-6-sean.anderson@linux.dev


Signed-off-by: default avatarSean Anderson <sean.anderson@linux.dev>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 78457cae

drivers/pci/controller/pcie-xilinx-nwl.c

+19 −4
Original line number Diff line number Diff line
@@ -779,6 +779,7 @@ static int nwl_pcie_probe(struct platform_device *pdev) 
		return -ENODEV;



	pcie = pci_host_bridge_priv(bridge);

	platform_set_drvdata(pdev, pcie);



	pcie->dev = dev;
@@ -801,13 +802,13 @@ static int nwl_pcie_probe(struct platform_device *pdev) 
	err = nwl_pcie_bridge_init(pcie);

	if (err) {

		dev_err(dev, "HW Initialization failed\n");

		return err;

		goto err_clk;

	}



	err = nwl_pcie_init_irq_domain(pcie);

	if (err) {

		dev_err(dev, "Failed creating IRQ Domain\n");

		return err;

		goto err_clk;

	}



	bridge->sysdata = pcie;
@@ -817,11 +818,24 @@ static int nwl_pcie_probe(struct platform_device *pdev) 
		err = nwl_pcie_enable_msi(pcie);

		if (err < 0) {

			dev_err(dev, "failed to enable MSI support: %d\n", err);

			return err;

			goto err_clk;

		}

	}



	return pci_host_probe(bridge);

	err = pci_host_probe(bridge);

	if (!err)

		return 0;



err_clk:

	clk_disable_unprepare(pcie->clk);

	return err;

}



static void nwl_pcie_remove(struct platform_device *pdev)

{

	struct nwl_pcie *pcie = platform_get_drvdata(pdev);



	clk_disable_unprepare(pcie->clk);

}



static struct platform_driver nwl_pcie_driver = {
@@ -831,5 +845,6 @@ static struct platform_driver nwl_pcie_driver = { 
		.of_match_table = nwl_pcie_of_match,

	},

	.probe = nwl_pcie_probe,

	.remove_new = nwl_pcie_remove,

};

builtin_platform_driver(nwl_pcie_driver);