Patch "mtd: rawnand: mtk: Factorize out the logic cleaning mtk chips" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    mtd: rawnand: mtk: Factorize out the logic cleaning mtk chips

to the 6.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mtd-rawnand-mtk-factorize-out-the-logic-cleaning-mtk.patch
and it can be found in the queue-6.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e282feee15f1c40f1a4149e1c712d526197fa78a
Author: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
Date:   Mon Aug 26 17:30:18 2024 +0200

    mtd: rawnand: mtk: Factorize out the logic cleaning mtk chips
    
    [ Upstream commit 81cb3be3261e766a1f8efab9e3154a4f4fd9d03d ]
    
    There are some un-freed resources in one of the error path which would
    benefit from a helper going through all the registered mtk chips one by
    one and perform all the necessary cleanup. This is precisely what the
    remove path does, so let's extract the logic in a helper.
    
    There is no functional change.
    
    Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
    Reviewed-by: Pratyush Yadav <pratyush@xxxxxxxxxx>
    Reviewed-by: Matthias Brugger <matthias.bgg@xxxxxxxxxx>
    Link: https://lore.kernel.org/linux-mtd/20240826153019.67106-1-miquel.raynal@xxxxxxxxxxx
    Stable-dep-of: 2073ae37d550 ("mtd: rawnand: mtk: Fix init error path")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c
index d65e6371675bb..bf845dd167374 100644
--- a/drivers/mtd/nand/raw/mtk_nand.c
+++ b/drivers/mtd/nand/raw/mtk_nand.c
@@ -1429,6 +1429,23 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc,
 	return 0;
 }
 
+static void mtk_nfc_nand_chips_cleanup(struct mtk_nfc *nfc)
+{
+	struct mtk_nfc_nand_chip *mtk_chip;
+	struct nand_chip *chip;
+	int ret;
+
+	while (!list_empty(&nfc->chips)) {
+		mtk_chip = list_first_entry(&nfc->chips,
+					    struct mtk_nfc_nand_chip, node);
+		chip = &mtk_chip->nand;
+		ret = mtd_device_unregister(nand_to_mtd(chip));
+		WARN_ON(ret);
+		nand_cleanup(chip);
+		list_del(&mtk_chip->node);
+	}
+}
+
 static int mtk_nfc_nand_chips_init(struct device *dev, struct mtk_nfc *nfc)
 {
 	struct device_node *np = dev->of_node;
@@ -1567,20 +1584,8 @@ static int mtk_nfc_probe(struct platform_device *pdev)
 static void mtk_nfc_remove(struct platform_device *pdev)
 {
 	struct mtk_nfc *nfc = platform_get_drvdata(pdev);
-	struct mtk_nfc_nand_chip *mtk_chip;
-	struct nand_chip *chip;
-	int ret;
-
-	while (!list_empty(&nfc->chips)) {
-		mtk_chip = list_first_entry(&nfc->chips,
-					    struct mtk_nfc_nand_chip, node);
-		chip = &mtk_chip->nand;
-		ret = mtd_device_unregister(nand_to_mtd(chip));
-		WARN_ON(ret);
-		nand_cleanup(chip);
-		list_del(&mtk_chip->node);
-	}
 
+	mtk_nfc_nand_chips_cleanup(nfc);
 	mtk_ecc_release(nfc->ecc);
 }