net: stmmac: dwmac-qcom-ethqos: use devm_stmmac_pltfr_probe()

Bartosz Golaszewski · kuba-moo · commit 4194f32a4b2b · 2023-06-24T15:36:00.000-07:00
Use the devres variant of stmmac_pltfr_probe() and finally drop the remove() callback entirely. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Link: https://lore.kernel.org/r/20230623100417.93592-12-brgl@bgdev.pl Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -787,7 +787,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
 		plat_dat->serdes_powerdown  = qcom_ethqos_serdes_powerdown;
 	}
 
-	return stmmac_dvr_probe(dev, plat_dat, &stmmac_res);
+	return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);
 }
 
 static const struct of_device_id qcom_ethqos_match[] = {
@@ -801,7 +801,6 @@ MODULE_DEVICE_TABLE(of, qcom_ethqos_match);
 
 static struct platform_driver qcom_ethqos_driver = {
 	.probe  = qcom_ethqos_probe,
-	.remove_new = stmmac_pltfr_remove_no_dt,
 	.driver = {
 		.name           = "qcom-ethqos",
 		.pm		= &stmmac_pltfr_pm_ops,

Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)`
`787`	`787`	`plat_dat->serdes_powerdown = qcom_ethqos_serdes_powerdown;`
`788`	`788`	`}`
`789`	`789`
`790`		`- return stmmac_dvr_probe(dev, plat_dat, &stmmac_res);`
	`790`	`+ return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);`
`791`	`791`	`}`
`792`	`792`
`793`	`793`	`static const struct of_device_id qcom_ethqos_match[] = {`
`@@ -801,7 +801,6 @@ MODULE_DEVICE_TABLE(of, qcom_ethqos_match);`
`801`	`801`
`802`	`802`	`static struct platform_driver qcom_ethqos_driver = {`
`803`	`803`	`.probe = qcom_ethqos_probe,`
`804`		`- .remove_new = stmmac_pltfr_remove_no_dt,`
`805`	`804`	`.driver = {`
`806`	`805`	`.name = "qcom-ethqos",`
`807`	`806`	`.pm = &stmmac_pltfr_pm_ops,`