Commit 6ecac465 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/remove-void-callbacks' 

- Convert platform_device .remove() callbacks to return void instead of a
  mostly useless int (Uwe Kleine-König)

* pci/controller/remove-void-callbacks:
  PCI: xgene-msi: Convert to platform remove callback returning void
  PCI: tegra: Convert to platform remove callback returning void
  PCI: rockchip-host: Convert to platform remove callback returning void
  PCI: mvebu: Convert to platform remove callback returning void
  PCI: mt7621: Convert to platform remove callback returning void
  PCI: mediatek-gen3: Convert to platform remove callback returning void
  PCI: mediatek: Convert to platform remove callback returning void
  PCI: iproc: Convert to platform remove callback returning void
  PCI: hisi-error: Convert to platform remove callback returning void
  PCI: dwc: Convert to platform remove callback returning void
  PCI: j721e: Convert to platform remove callback returning void
  PCI: brcmstb: Convert to platform remove callback returning void
  PCI: altera-msi: Convert to platform remove callback returning void
  PCI: altera: Convert to platform remove callback returning void
  PCI: aardvark: Convert to platform remove callback returning void
parents d8c226ac afbb9130

drivers/pci/controller/cadence/pci-j721e.c

+2 −4
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) 
	return ret;

}



static int j721e_pcie_remove(struct platform_device *pdev)

static void j721e_pcie_remove(struct platform_device *pdev)

{

	struct j721e_pcie *pcie = platform_get_drvdata(pdev);

	struct cdns_pcie *cdns_pcie = pcie->cdns_pcie;
@@ -552,13 +552,11 @@ static int j721e_pcie_remove(struct platform_device *pdev) 
	cdns_pcie_disable_phy(cdns_pcie);

	pm_runtime_put(dev);

	pm_runtime_disable(dev);



	return 0;

}



static struct platform_driver j721e_pcie_driver = {

	.probe  = j721e_pcie_probe,

	.remove = j721e_pcie_remove,

	.remove_new = j721e_pcie_remove,

	.driver = {

		.name	= "j721e-pcie",

		.of_match_table = of_j721e_pcie_match,

drivers/pci/controller/dwc/pcie-bt1.c

+2 −4
Original line number Diff line number Diff line
@@ -617,13 +617,11 @@ static int bt1_pcie_probe(struct platform_device *pdev) 
	return bt1_pcie_add_port(btpci);

}



static int bt1_pcie_remove(struct platform_device *pdev)

static void bt1_pcie_remove(struct platform_device *pdev)

{

	struct bt1_pcie *btpci = platform_get_drvdata(pdev);



	bt1_pcie_del_port(btpci);



	return 0;

}



static const struct of_device_id bt1_pcie_of_match[] = {
@@ -634,7 +632,7 @@ MODULE_DEVICE_TABLE(of, bt1_pcie_of_match); 


static struct platform_driver bt1_pcie_driver = {

	.probe = bt1_pcie_probe,

	.remove = bt1_pcie_remove,

	.remove_new = bt1_pcie_remove,

	.driver = {

		.name	= "bt1-pcie",

		.of_match_table = bt1_pcie_of_match,

drivers/pci/controller/dwc/pcie-histb.c

+2 −4
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static int histb_pcie_probe(struct platform_device *pdev) 
	return 0;

}



static int histb_pcie_remove(struct platform_device *pdev)

static void histb_pcie_remove(struct platform_device *pdev)

{

	struct histb_pcie *hipcie = platform_get_drvdata(pdev);
@@ -429,8 +429,6 @@ static int histb_pcie_remove(struct platform_device *pdev) 


	if (hipcie->phy)

		phy_exit(hipcie->phy);



	return 0;

}



static const struct of_device_id histb_pcie_of_match[] = {
@@ -441,7 +439,7 @@ MODULE_DEVICE_TABLE(of, histb_pcie_of_match); 


static struct platform_driver histb_pcie_platform_driver = {

	.probe	= histb_pcie_probe,

	.remove	= histb_pcie_remove,

	.remove_new = histb_pcie_remove,

	.driver = {

		.name = "histb-pcie",

		.of_match_table = histb_pcie_of_match,

drivers/pci/controller/dwc/pcie-intel-gw.c

+2 −4
Original line number Diff line number Diff line
@@ -340,15 +340,13 @@ static void __intel_pcie_remove(struct intel_pcie *pcie) 
	phy_exit(pcie->phy);

}



static int intel_pcie_remove(struct platform_device *pdev)

static void intel_pcie_remove(struct platform_device *pdev)

{

	struct intel_pcie *pcie = platform_get_drvdata(pdev);

	struct dw_pcie_rp *pp = &pcie->pci.pp;



	dw_pcie_host_deinit(pp);

	__intel_pcie_remove(pcie);



	return 0;

}



static int intel_pcie_suspend_noirq(struct device *dev)
@@ -443,7 +441,7 @@ static const struct of_device_id of_intel_pcie_match[] = { 


static struct platform_driver intel_pcie_driver = {

	.probe = intel_pcie_probe,

	.remove = intel_pcie_remove,

	.remove_new = intel_pcie_remove,

	.driver = {

		.name = "intel-gw-pcie",

		.of_match_table = of_intel_pcie_match,

drivers/pci/controller/dwc/pcie-qcom-ep.c

+3 −5
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ static int qcom_pcie_ep_probe(struct platform_device *pdev) 
	return ret;

}



static int qcom_pcie_ep_remove(struct platform_device *pdev)

static void qcom_pcie_ep_remove(struct platform_device *pdev)

{

	struct qcom_pcie_ep *pcie_ep = platform_get_drvdata(pdev);
@@ -796,11 +796,9 @@ static int qcom_pcie_ep_remove(struct platform_device *pdev) 
	debugfs_remove_recursive(pcie_ep->debugfs);



	if (pcie_ep->link_status == QCOM_PCIE_EP_LINK_DISABLED)

		return 0;

		return;



	qcom_pcie_disable_resources(pcie_ep);



	return 0;

}



static const struct of_device_id qcom_pcie_ep_match[] = {
@@ -812,7 +810,7 @@ MODULE_DEVICE_TABLE(of, qcom_pcie_ep_match); 


static struct platform_driver qcom_pcie_ep_driver = {

	.probe	= qcom_pcie_ep_probe,

	.remove = qcom_pcie_ep_remove,

	.remove_new = qcom_pcie_ep_remove,

	.driver	= {

		.name = "qcom-pcie-ep",

		.of_match_table	= qcom_pcie_ep_match,