Commit e5835a0a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by David S. Miller
Browse files

net: ethernet: hisilicon: 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 ignored (apart
from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return
void. In the first step of this quest all drivers are converted to
.remove_new() which already returns void. Eventually after all drivers
are converted, .remove_new() is renamed to .remove().

Trivially convert these drivers from always returning zero in the remove
callback to the void returning variant.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc715af3

drivers/net/ethernet/hisilicon/hip04_eth.c

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

}



static int hip04_remove(struct platform_device *pdev)

static void hip04_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct hip04_priv *priv = netdev_priv(ndev);
@@ -1035,8 +1035,6 @@ static int hip04_remove(struct platform_device *pdev) 
	of_node_put(priv->phy_node);

	cancel_work_sync(&priv->tx_timeout_task);

	free_netdev(ndev);



	return 0;

}



static const struct of_device_id hip04_mac_match[] = {
@@ -1048,7 +1046,7 @@ MODULE_DEVICE_TABLE(of, hip04_mac_match); 


static struct platform_driver hip04_mac_driver = {

	.probe	= hip04_mac_probe,

	.remove	= hip04_remove,

	.remove_new = hip04_remove,

	.driver	= {

		.name		= DRV_NAME,

		.of_match_table	= hip04_mac_match,

drivers/net/ethernet/hisilicon/hisi_femac.c

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

}



static int hisi_femac_drv_remove(struct platform_device *pdev)

static void hisi_femac_drv_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct hisi_femac_priv *priv = netdev_priv(ndev);
@@ -904,8 +904,6 @@ static int hisi_femac_drv_remove(struct platform_device *pdev) 
	phy_disconnect(ndev->phydev);

	clk_disable_unprepare(priv->clk);

	free_netdev(ndev);



	return 0;

}



#ifdef CONFIG_PM
@@ -961,7 +959,7 @@ static struct platform_driver hisi_femac_driver = { 
		.of_match_table = hisi_femac_match,

	},

	.probe = hisi_femac_drv_probe,

	.remove = hisi_femac_drv_remove,

	.remove_new = hisi_femac_drv_remove,

#ifdef CONFIG_PM

	.suspend = hisi_femac_drv_suspend,

	.resume = hisi_femac_drv_resume,

drivers/net/ethernet/hisilicon/hix5hd2_gmac.c

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

}



static int hix5hd2_dev_remove(struct platform_device *pdev)

static void hix5hd2_dev_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct hix5hd2_priv *priv = netdev_priv(ndev);
@@ -1298,8 +1298,6 @@ static int hix5hd2_dev_remove(struct platform_device *pdev) 
	of_node_put(priv->phy_node);

	cancel_work_sync(&priv->tx_timeout_task);

	free_netdev(ndev);



	return 0;

}



static const struct of_device_id hix5hd2_of_match[] = {
@@ -1319,7 +1317,7 @@ static struct platform_driver hix5hd2_dev_driver = { 
		.of_match_table = hix5hd2_of_match,

	},

	.probe = hix5hd2_dev_probe,

	.remove = hix5hd2_dev_remove,

	.remove_new = hix5hd2_dev_remove,

};



module_platform_driver(hix5hd2_dev_driver);

drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c

+2 −4
Original line number Diff line number Diff line
@@ -3007,7 +3007,7 @@ static int hns_dsaf_probe(struct platform_device *pdev) 
 * hns_dsaf_remove - remove dsaf dev

 * @pdev: dasf platform device

 */

static int hns_dsaf_remove(struct platform_device *pdev)

static void hns_dsaf_remove(struct platform_device *pdev)

{

	struct dsaf_device *dsaf_dev = dev_get_drvdata(&pdev->dev);
@@ -3020,8 +3020,6 @@ static int hns_dsaf_remove(struct platform_device *pdev) 
	hns_dsaf_free(dsaf_dev);



	hns_dsaf_free_dev(dsaf_dev);



	return 0;

}



static const struct of_device_id g_dsaf_match[] = {
@@ -3033,7 +3031,7 @@ MODULE_DEVICE_TABLE(of, g_dsaf_match); 


static struct platform_driver g_dsaf_driver = {

	.probe = hns_dsaf_probe,

	.remove = hns_dsaf_remove,

	.remove_new = hns_dsaf_remove,

	.driver = {

		.name = DSAF_DRV_NAME,

		.of_match_table = g_dsaf_match,

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+2 −3
Original line number Diff line number Diff line
@@ -2384,7 +2384,7 @@ static int hns_nic_dev_probe(struct platform_device *pdev) 
	return ret;

}



static int hns_nic_dev_remove(struct platform_device *pdev)

static void hns_nic_dev_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct hns_nic_priv *priv = netdev_priv(ndev);
@@ -2413,7 +2413,6 @@ static int hns_nic_dev_remove(struct platform_device *pdev) 
	of_node_put(to_of_node(priv->fwnode));



	free_netdev(ndev);

	return 0;

}



static const struct of_device_id hns_enet_of_match[] = {
@@ -2431,7 +2430,7 @@ static struct platform_driver hns_nic_dev_driver = { 
		.acpi_match_table = ACPI_PTR(hns_enet_acpi_match),

	},

	.probe = hns_nic_dev_probe,

	.remove = hns_nic_dev_remove,

	.remove_new = hns_nic_dev_remove,

};



module_platform_driver(hns_nic_dev_driver);