diff options
-rw-r--r-- | drivers/mtd/nand/plat_nand.c | 1 | ||||
-rw-r--r-- | include/linux/mtd/nand.h | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c index dc88a58d5cde..a0e26dea1424 100644 --- a/drivers/mtd/nand/plat_nand.c +++ b/drivers/mtd/nand/plat_nand.c | |||
@@ -56,7 +56,6 @@ static int plat_nand_probe(struct platform_device *pdev) | |||
56 | if (IS_ERR(data->io_base)) | 56 | if (IS_ERR(data->io_base)) |
57 | return PTR_ERR(data->io_base); | 57 | return PTR_ERR(data->io_base); |
58 | 58 | ||
59 | data->chip.priv = &data; | ||
60 | nand_set_flash_node(&data->chip, pdev->dev.of_node); | 59 | nand_set_flash_node(&data->chip, pdev->dev.of_node); |
61 | mtd = nand_to_mtd(&data->chip); | 60 | mtd = nand_to_mtd(&data->chip); |
62 | mtd->dev.parent = &pdev->dev; | 61 | mtd->dev.parent = &pdev->dev; |
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 2bee2e42ae2f..3e92be1d2d43 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h | |||
@@ -927,15 +927,6 @@ struct platform_nand_data { | |||
927 | struct platform_nand_ctrl ctrl; | 927 | struct platform_nand_ctrl ctrl; |
928 | }; | 928 | }; |
929 | 929 | ||
930 | /* Some helpers to access the data structures */ | ||
931 | static inline | ||
932 | struct platform_nand_chip *get_platform_nandchip(struct mtd_info *mtd) | ||
933 | { | ||
934 | struct nand_chip *chip = mtd->priv; | ||
935 | |||
936 | return chip->priv; | ||
937 | } | ||
938 | |||
939 | /* return the supported features. */ | 930 | /* return the supported features. */ |
940 | static inline int onfi_feature(struct nand_chip *chip) | 931 | static inline int onfi_feature(struct nand_chip *chip) |
941 | { | 932 | { |