Commit 3246627f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jakub Kicinski
Browse files

net: stmmac: Make stmmac_pltfr_remove() return void 



The function returns zero unconditionally. Change it to return void instead
which simplifies some callers as error handing becomes unnecessary.

The function is also used for some drivers as remove callback. Switch these
to the .remove_new() callback. For some others no error can happen in the
remove callback now, convert them to .remove_new(), too.

Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 505e315b

drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ MODULE_DEVICE_TABLE(of, anarion_dwmac_match); 


static struct platform_driver anarion_dwmac_driver = {

	.probe  = anarion_dwmac_probe,

	.remove = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove,

	.driver = {

		.name           = "anarion-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,

drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ MODULE_DEVICE_TABLE(of, dwmac_generic_match); 


static struct platform_driver dwmac_generic_driver = {

	.probe  = dwmac_generic_probe,

	.remove = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove,

	.driver = {

		.name           = STMMAC_RESOURCE_NAME,

		.pm		= &stmmac_pltfr_pm_ops,

drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ MODULE_DEVICE_TABLE(of, imx_dwmac_match); 


static struct platform_driver imx_dwmac_driver = {

	.probe  = imx_dwmac_probe,

	.remove = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove,

	.driver = {

		.name           = "imx-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,

drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ MODULE_DEVICE_TABLE(of, ingenic_mac_of_matches); 


static struct platform_driver ingenic_mac_driver = {

	.probe		= ingenic_mac_probe,

	.remove		= stmmac_pltfr_remove,

	.remove_new	= stmmac_pltfr_remove,

	.driver		= {

		.name	= "ingenic-mac",

		.pm		= pm_ptr(&ingenic_mac_pm_ops),

drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c

+3 −6
Original line number Diff line number Diff line
@@ -169,20 +169,17 @@ static int intel_eth_plat_probe(struct platform_device *pdev) 
	return ret;

}



static int intel_eth_plat_remove(struct platform_device *pdev)

static void intel_eth_plat_remove(struct platform_device *pdev)

{

	struct intel_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev);

	int ret;



	ret = stmmac_pltfr_remove(pdev);

	stmmac_pltfr_remove(pdev);

	clk_disable_unprepare(dwmac->tx_clk);



	return ret;

}



static struct platform_driver intel_eth_plat_driver = {

	.probe  = intel_eth_plat_probe,

	.remove = intel_eth_plat_remove,

	.remove_new = intel_eth_plat_remove,

	.driver = {

		.name		= "intel-eth-plat",

		.pm		= &stmmac_pltfr_pm_ops,