siflower: switch to .remove_new for downstream driver

Ansuel · Ansuel · commit 00a166d0658a · 2025-11-19T11:26:55.000+01:00
Switch to .remove_new for downstream driver that still use the old
.remove to reduce patch delta for 6.12 bump.

Suggested-by: Zhu Yujie &lt;libriunc@gmail.com&gt;
Signed-off-by: Christian Marangi &lt;ansuelsmth@gmail.com&gt;
diff --git a/target/linux/siflower/files-6.6/drivers/gpio/gpio-siflower.c b/target/linux/siflower/files-6.6/drivers/gpio/gpio-siflower.c
@@ -317,12 +317,11 @@ static int sf_gpio_probe(struct platform_device *pdev)
 	return devm_gpiochip_add_data(dev, gc, priv);
 }
 
-static int sf_gpio_remove(struct platform_device *pdev)
+static void sf_gpio_remove(struct platform_device *pdev)
 {
 	struct sf_gpio_priv *priv = platform_get_drvdata(pdev);
 
 	reset_control_assert(priv->rstc);
-	return 0;
 }
 
 static const struct of_device_id sf_gpio_ids[] = {
@@ -333,7 +332,7 @@ MODULE_DEVICE_TABLE(of, sf_gpio_ids);
 
 static struct platform_driver sf_gpio_driver = {
 	.probe		= sf_gpio_probe,
-	.remove		= sf_gpio_remove,
+	.remove_new	= sf_gpio_remove,
 	.driver = {
 		.name		= "siflower_gpio",
 		.owner		= THIS_MODULE,
diff --git a/target/linux/siflower/files-6.6/drivers/net/ethernet/siflower/sfxpcs.c b/target/linux/siflower/files-6.6/drivers/net/ethernet/siflower/sfxpcs.c
@@ -592,12 +592,12 @@ static int xpcs_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int xpcs_remove(struct platform_device *pdev)
+static void xpcs_remove(struct platform_device *pdev)
 {
 	struct xpcs_priv *priv = platform_get_drvdata(pdev);
 
 	clk_bulk_disable_unprepare(XPCS_NUM_CLKS, priv->clks);
-	return regmap_clear_bits(priv->ethsys, ETHSYS_RST, BIT(5 + priv->id));
+	regmap_clear_bits(priv->ethsys, ETHSYS_RST, BIT(5 + priv->id));
 }
 
 static const struct of_device_id xpcs_match[] = {
@@ -608,7 +608,7 @@ MODULE_DEVICE_TABLE(of, xpcs_match);
 
 static struct platform_driver xpcs_driver = {
 	.probe	= xpcs_probe,
-	.remove	= xpcs_remove,
+	.remove_new	= xpcs_remove,
 	.driver	= {
 		.name		= "sfxpcs",
 		.of_match_table	= xpcs_match,
diff --git a/target/linux/siflower/files-6.6/drivers/pci/controller/dwc/pcie-sf21.c b/target/linux/siflower/files-6.6/drivers/pci/controller/dwc/pcie-sf21.c
@@ -332,13 +332,11 @@ static int sf_pcie_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int sf_pcie_remove(struct platform_device *pdev)
+static void sf_pcie_remove(struct platform_device *pdev)
 {
 	struct sf_pcie *pcie = platform_get_drvdata(pdev);
 
 	dw_pcie_host_deinit(&pcie->pci.pp);
-	return 0;
-
 }
 
 static const struct of_device_id sf_pcie_of_match[] = {
@@ -353,7 +351,7 @@ static struct platform_driver sf_pcie_driver = {
 		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
 	},
 	.probe    = sf_pcie_probe,
-	.remove	  = sf_pcie_remove,
+	.remove_new = sf_pcie_remove,
 };
 
 module_platform_driver(sf_pcie_driver);

Original file line number	Diff line number	Diff line change
`@@ -317,12 +317,11 @@ static int sf_gpio_probe(struct platform_device *pdev)`
`317`	`317`	`return devm_gpiochip_add_data(dev, gc, priv);`
`318`	`318`	`}`
`319`	`319`
`320`		`-static int sf_gpio_remove(struct platform_device *pdev)`
	`320`	`+static void sf_gpio_remove(struct platform_device *pdev)`
`321`	`321`	`{`
`322`	`322`	`struct sf_gpio_priv *priv = platform_get_drvdata(pdev);`
`323`	`323`
`324`	`324`	`reset_control_assert(priv->rstc);`
`325`		`- return 0;`
`326`	`325`	`}`
`327`	`326`
`328`	`327`	`static const struct of_device_id sf_gpio_ids[] = {`
`@@ -333,7 +332,7 @@ MODULE_DEVICE_TABLE(of, sf_gpio_ids);`
`333`	`332`
`334`	`333`	`static struct platform_driver sf_gpio_driver = {`
`335`	`334`	`.probe = sf_gpio_probe,`
`336`		`- .remove = sf_gpio_remove,`
	`335`	`+ .remove_new = sf_gpio_remove,`
`337`	`336`	`.driver = {`
`338`	`337`	`.name = "siflower_gpio",`
`339`	`338`	`.owner = THIS_MODULE,`
Original file line number	Diff line number	Diff line change
`@@ -592,12 +592,12 @@ static int xpcs_probe(struct platform_device *pdev)`
`592`	`592`	`return 0;`
`593`	`593`	`}`
`594`	`594`
`595`		`-static int xpcs_remove(struct platform_device *pdev)`
	`595`	`+static void xpcs_remove(struct platform_device *pdev)`
`596`	`596`	`{`
`597`	`597`	`struct xpcs_priv *priv = platform_get_drvdata(pdev);`
`598`	`598`
`599`	`599`	`clk_bulk_disable_unprepare(XPCS_NUM_CLKS, priv->clks);`
`600`		`- return regmap_clear_bits(priv->ethsys, ETHSYS_RST, BIT(5 + priv->id));`
	`600`	`+ regmap_clear_bits(priv->ethsys, ETHSYS_RST, BIT(5 + priv->id));`
`601`	`601`	`}`
`602`	`602`
`603`	`603`	`static const struct of_device_id xpcs_match[] = {`
`@@ -608,7 +608,7 @@ MODULE_DEVICE_TABLE(of, xpcs_match);`
`608`	`608`
`609`	`609`	`static struct platform_driver xpcs_driver = {`
`610`	`610`	`.probe = xpcs_probe,`
`611`		`- .remove = xpcs_remove,`
	`611`	`+ .remove_new = xpcs_remove,`
`612`	`612`	`.driver = {`
`613`	`613`	`.name = "sfxpcs",`
`614`	`614`	`.of_match_table = xpcs_match,`
Original file line number	Diff line number	Diff line change
`@@ -332,13 +332,11 @@ static int sf_pcie_probe(struct platform_device *pdev)`
`332`	`332`	`return 0;`
`333`	`333`	`}`
`334`	`334`
`335`		`-static int sf_pcie_remove(struct platform_device *pdev)`
	`335`	`+static void sf_pcie_remove(struct platform_device *pdev)`
`336`	`336`	`{`
`337`	`337`	`struct sf_pcie *pcie = platform_get_drvdata(pdev);`
`338`	`338`
`339`	`339`	`dw_pcie_host_deinit(&pcie->pci.pp);`
`340`		`- return 0;`
`341`		`-`
`342`	`340`	`}`
`343`	`341`
`344`	`342`	`static const struct of_device_id sf_pcie_of_match[] = {`
`@@ -353,7 +351,7 @@ static struct platform_driver sf_pcie_driver = {`
`353`	`351`	`.probe_type = PROBE_PREFER_ASYNCHRONOUS,`
`354`	`352`	`},`
`355`	`353`	`.probe = sf_pcie_probe,`
`356`		`- .remove = sf_pcie_remove,`
	`354`	`+ .remove_new = sf_pcie_remove,`
`357`	`355`	`};`
`358`	`356`
`359`	`357`	`module_platform_driver(sf_pcie_driver);`