mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
mtd: rawnand: ndfc: use devm_kasprintf for mtd name
Convert the mtd->name allocation from kasprintf() plus a manual kfree() in the error path and in ndfc_remove() to the managed devm_kasprintf() helper. The name is now released automatically with the device, removing the need for explicit cleanup. Assisted-by: opencode:hy3-free Signed-off-by: Rosen Penev <rosenp@gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
parent
7e874b1750
commit
5e73728a87
|
|
@ -162,8 +162,8 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
|
|||
return -ENODEV;
|
||||
nand_set_flash_node(chip, flash_np);
|
||||
|
||||
mtd->name = kasprintf(GFP_KERNEL, "%s.%pOFn", dev_name(&ndfc->ofdev->dev),
|
||||
flash_np);
|
||||
mtd->name = devm_kasprintf(&ndfc->ofdev->dev, GFP_KERNEL, "%s.%pOFn",
|
||||
dev_name(&ndfc->ofdev->dev), flash_np);
|
||||
if (!mtd->name) {
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
|
|
@ -177,8 +177,6 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
|
|||
|
||||
err:
|
||||
of_node_put(flash_np);
|
||||
if (ret)
|
||||
kfree(mtd->name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -246,7 +244,6 @@ static void ndfc_remove(struct platform_device *ofdev)
|
|||
ret = mtd_device_unregister(mtd);
|
||||
WARN_ON(ret);
|
||||
nand_cleanup(chip);
|
||||
kfree(mtd->name);
|
||||
}
|
||||
|
||||
static const struct of_device_id ndfc_match[] = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user