mtd: nand: omap: Do not use global variables

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=94cb4ee0f75383327fbeeb91909b342dae3771a5
Commit:     94cb4ee0f75383327fbeeb91909b342dae3771a5
Parent:     e66fcf722a74786c500957608f3230e843960b42
Author:     Rostislav Lisovy <lisovy at gmail.com>
AuthorDate: Thu Oct 2 14:16:12 2014 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Oct 22 01:33:33 2014 -0700

    mtd: nand: omap: Do not use global variables
    
    Since the commit 97a288ba2cfa ("ARM: omap2+: gpmc-nand: Use
    dynamic platform_device_alloc()") gpmc-nand driver supports
    multiple NAND flash devices connected to the single controller.
    Remove global variable to make the code thread-safe.
    
    Signed-off-by: Rostislav Lisovy <lisovy at merica.cz>
    Acked-by: Roger Quadros <rogerq at ti.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/nand/omap2.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 3b357e9..b0f89d8 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -144,9 +144,6 @@ static u_char bch8_vector[] = {0xf3, 0xdb, 0x14, 0x16, 0x8b, 0xd2, 0xbe, 0xcc,
 	0xac, 0x6b, 0xff, 0x99, 0x7b};
 static u_char bch4_vector[] = {0x00, 0x6b, 0x31, 0xdd, 0x41, 0xbc, 0x10};
 
-/* oob info generated runtime depending on ecc algorithm and layout selected */
-static struct nand_ecclayout omap_oobinfo;
-
 struct omap_nand_info {
 	struct nand_hw_control		controller;
 	struct omap_nand_platform_data	*pdata;
@@ -168,6 +165,8 @@ struct omap_nand_info {
 	u_char				*buf;
 	int					buf_len;
 	struct gpmc_nand_regs		reg;
+	/* generated at runtime depending on ECC algorithm and layout selected */
+	struct nand_ecclayout		oobinfo;
 	/* fields specific for BCHx_HW ECC scheme */
 	struct device			*elm_dev;
 	struct device_node		*of_node;
@@ -1840,7 +1839,7 @@ static int omap_nand_probe(struct platform_device *pdev)
 	}
 
 	/* populate MTD interface based on ECC scheme */
-	ecclayout		= &omap_oobinfo;
+	ecclayout		= &info->oobinfo;
 	switch (info->ecc_opt) {
 	case OMAP_ECC_HAM1_CODE_SW:
 		nand_chip->ecc.mode = NAND_ECC_SOFT;