Unverified Commit 6f1c0a04 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Krzysztof Wilczyński
Browse files

PCI: iproc: Convert to platform remove callback returning void 

The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code. However the value returned is (mostly) ignored
and this typically results in resource leaks.

The iproc driver always returns 0, it's just a bit hidden. So make
iproc_pcie_remove() return void instead of always zero and convert the
platform driver to the alternative remove callback that returns void and
eventually replaces the int returning callback.

Link: https://lore.kernel.org/linux-pci/20230321193208.366561-9-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 9a285fbb

drivers/pci/controller/pcie-iproc-platform.c

+3 −3
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ static int iproc_pltfm_pcie_probe(struct platform_device *pdev) 
	return 0;

}



static int iproc_pltfm_pcie_remove(struct platform_device *pdev)

static void iproc_pltfm_pcie_remove(struct platform_device *pdev)

{

	struct iproc_pcie *pcie = platform_get_drvdata(pdev);



	return iproc_pcie_remove(pcie);

	iproc_pcie_remove(pcie);

}



static void iproc_pltfm_pcie_shutdown(struct platform_device *pdev)
@@ -134,7 +134,7 @@ static struct platform_driver iproc_pltfm_pcie_driver = { 
		.of_match_table = of_match_ptr(iproc_pcie_of_match_table),

	},

	.probe = iproc_pltfm_pcie_probe,

	.remove = iproc_pltfm_pcie_remove,

	.remove_new = iproc_pltfm_pcie_remove,

	.shutdown = iproc_pltfm_pcie_shutdown,

};

module_platform_driver(iproc_pltfm_pcie_driver);

drivers/pci/controller/pcie-iproc.c

+1 −3
Original line number Diff line number Diff line
@@ -1537,7 +1537,7 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) 
}

EXPORT_SYMBOL(iproc_pcie_setup);



int iproc_pcie_remove(struct iproc_pcie *pcie)

void iproc_pcie_remove(struct iproc_pcie *pcie)

{

	struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie);
@@ -1548,8 +1548,6 @@ int iproc_pcie_remove(struct iproc_pcie *pcie) 


	phy_power_off(pcie->phy);

	phy_exit(pcie->phy);



	return 0;

}

EXPORT_SYMBOL(iproc_pcie_remove);

drivers/pci/controller/pcie-iproc.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct iproc_pcie { 
};



int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res);

int iproc_pcie_remove(struct iproc_pcie *pcie);

void iproc_pcie_remove(struct iproc_pcie *pcie);

int iproc_pcie_shutdown(struct iproc_pcie *pcie);



#ifdef CONFIG_PCIE_IPROC_MSI