mtd: nand: remove unused and buggy get_platform_nandchip() helper function
authorBoris BREZILLON <boris.brezillon@free-electrons.com>
Mon, 14 Dec 2015 15:13:31 +0000 (16:13 +0100)
committerBrian Norris <computersforpeace@gmail.com>
Fri, 18 Dec 2015 22:24:36 +0000 (14:24 -0800)
Nobody uses the get_platform_nandchip() helper function which is supposed
to return a pointer to a platform_nand_chip struct from an mtd_info
pointer.
Moreover, this function is buggy since the introduction of the plat_nand
layer (chip->priv is now storing a pointer to an intermediate
plat_nand_data structure allocated in plat_nand_probe(), and we have no
way to retrieve a pointer to the provided platform_nand_chip struct from
this plat_nand_data pointer).

While we are at it, remove the useless (and buggy, since it's pointing to
something stored on the stack) data->chip.priv assignment.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: 711fdf627ce1 ("[MTD] [NAND] platform NAND driver: add driver")
Cc: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/nand/plat_nand.c
include/linux/mtd/nand.h

index dc88a58d5cdeb3d9471479102575b44fdacc6044..a0e26dea1424bb3ef0053836512a0a6a3c085265 100644 (file)
@@ -56,7 +56,6 @@ static int plat_nand_probe(struct platform_device *pdev)
        if (IS_ERR(data->io_base))
                return PTR_ERR(data->io_base);
 
-       data->chip.priv = &data;
        nand_set_flash_node(&data->chip, pdev->dev.of_node);
        mtd = nand_to_mtd(&data->chip);
        mtd->dev.parent = &pdev->dev;
index 2bee2e42ae2f1268a88f1f350501177b20e10311..3e92be1d2d439b24798037ea7a9d4b0677de4b2c 100644 (file)
@@ -927,15 +927,6 @@ struct platform_nand_data {
        struct platform_nand_ctrl ctrl;
 };
 
-/* Some helpers to access the data structures */
-static inline
-struct platform_nand_chip *get_platform_nandchip(struct mtd_info *mtd)
-{
-       struct nand_chip *chip = mtd->priv;
-
-       return chip->priv;
-}
-
 /* return the supported features. */
 static inline int onfi_feature(struct nand_chip *chip)
 {