Commit eb30ad41 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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

- Convert exynos, keystone, kirin from .remove() to .remove_new(), which
  returns void instead of int (Uwe Kleine-König)

* pci/controller/remove-void-return:
  PCI: kirin: Convert to platform remove callback returning void
  PCI: keystone: Convert to platform remove callback returning void
  PCI: exynos: Convert to platform remove callback returning void
parents fd286a1d a5eee689

drivers/pci/controller/dwc/pci-exynos.c

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

}



static int exynos_pcie_remove(struct platform_device *pdev)

static void exynos_pcie_remove(struct platform_device *pdev)

{

	struct exynos_pcie *ep = platform_get_drvdata(pdev);
@@ -385,8 +385,6 @@ static int exynos_pcie_remove(struct platform_device *pdev) 
	phy_exit(ep->phy);

	exynos_pcie_deinit_clk_resources(ep);

	regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies);



	return 0;

}



static int exynos_pcie_suspend_noirq(struct device *dev)
@@ -431,7 +429,7 @@ static const struct of_device_id exynos_pcie_of_match[] = { 


static struct platform_driver exynos_pcie_driver = {

	.probe		= exynos_pcie_probe,

	.remove		= exynos_pcie_remove,

	.remove_new	= exynos_pcie_remove,

	.driver = {

		.name	= "exynos-pcie",

		.of_match_table = exynos_pcie_of_match,

drivers/pci/controller/dwc/pci-keystone.c

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

}



static int ks_pcie_remove(struct platform_device *pdev)

static void ks_pcie_remove(struct platform_device *pdev)

{

	struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev);

	struct device_link **link = ks_pcie->link;
@@ -1323,13 +1323,11 @@ static int ks_pcie_remove(struct platform_device *pdev) 
	ks_pcie_disable_phy(ks_pcie);

	while (num_lanes--)

		device_link_del(link[num_lanes]);



	return 0;

}



static struct platform_driver ks_pcie_driver = {

	.probe  = ks_pcie_probe,

	.remove = ks_pcie_remove,

	.remove_new = ks_pcie_remove,

	.driver = {

		.name	= "keystone-pcie",

		.of_match_table = ks_pcie_of_match,

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

+2 −4
Original line number Diff line number Diff line
@@ -738,15 +738,13 @@ static int kirin_pcie_power_on(struct platform_device *pdev, 
	return ret;

}



static int kirin_pcie_remove(struct platform_device *pdev)

static void kirin_pcie_remove(struct platform_device *pdev)

{

	struct kirin_pcie *kirin_pcie = platform_get_drvdata(pdev);



	dw_pcie_host_deinit(&kirin_pcie->pci->pp);



	kirin_pcie_power_off(kirin_pcie);



	return 0;

}



struct kirin_pcie_data {
@@ -815,7 +813,7 @@ static int kirin_pcie_probe(struct platform_device *pdev) 


static struct platform_driver kirin_pcie_driver = {

	.probe			= kirin_pcie_probe,

	.remove	        	= kirin_pcie_remove,

	.remove_new		= kirin_pcie_remove,

	.driver			= {

		.name			= "kirin-pcie",

		.of_match_table		= kirin_pcie_match,