soc: microchip: mpfs-control-scb: Fix resource leak on driver unbind

outman119 · ConchuOD · commit 27459f86a437 · 2026-03-19T15:55:16.000Z
Use devm_mfd_add_devices() instead of mfd_add_devices() to ensure child devices are properly removed when the driver unbinds. Fixes: 4aac11c ("soc: microchip: add mfd drivers for two syscon regions on PolarFire SoC") Signed-off-by: Felix Gu <ustc.gu@gmail.com> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
diff --git a/drivers/soc/microchip/mpfs-control-scb.c b/drivers/soc/microchip/mpfs-control-scb.c
@@ -14,8 +14,10 @@ static int mpfs_control_scb_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 
-	return mfd_add_devices(dev, PLATFORM_DEVID_NONE, mpfs_control_scb_devs,
-			       ARRAY_SIZE(mpfs_control_scb_devs), NULL, 0, NULL);
+	return devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE,
+				    mpfs_control_scb_devs,
+				    ARRAY_SIZE(mpfs_control_scb_devs), NULL, 0,
+				    NULL);
 }
 
 static const struct of_device_id mpfs_control_scb_of_match[] = {

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,10 @@ static int mpfs_control_scb_probe(struct platform_device *pdev)`
`14`	`14`	`{`
`15`	`15`	`struct device *dev = &pdev->dev;`
`16`	`16`
`17`		`- return mfd_add_devices(dev, PLATFORM_DEVID_NONE, mpfs_control_scb_devs,`
`18`		`- ARRAY_SIZE(mpfs_control_scb_devs), NULL, 0, NULL);`
	`17`	`+ return devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE,`
	`18`	`+ mpfs_control_scb_devs,`
	`19`	`+ ARRAY_SIZE(mpfs_control_scb_devs), NULL, 0,`
	`20`	`+ NULL);`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`static const struct of_device_id mpfs_control_scb_of_match[] = {`