Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f88f44cb authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

mtd: nand: s3c2410: kill the ->ecc_layout field 



The s3c2410 is allowing board data to overload the default ECC layout
defined inside the driver, but this feature is not used by board
specific definitions.
Kill this field so that we can easily move to a model where ecclayout
are dynamically allocated by the NAND controller driver.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 2c9e5779

arch/arm/plat-samsung/devs.c

+0 −9
Original line number Diff line number Diff line
@@ -727,15 +727,6 @@ static int __init s3c_nand_copy_set(struct s3c2410_nand_set *set) 
			return -ENOMEM;

	}



	if (set->ecc_layout) {

		ptr = kmemdup(set->ecc_layout,

			      sizeof(struct nand_ecclayout), GFP_KERNEL);

		set->ecc_layout = ptr;



		if (!ptr)

			return -ENOMEM;

	}



	return 0;

}

drivers/mtd/nand/s3c2410.c

+0 −3
Original line number Diff line number Diff line
@@ -861,9 +861,6 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info, 
	chip->ecc.mode	    = NAND_ECC_SOFT;

#endif



	if (set->ecc_layout != NULL)

		chip->ecc.layout = set->ecc_layout;



	if (set->disable_ecc)

		chip->ecc.mode	= NAND_ECC_NONE;

include/linux/platform_data/mtd-nand-s3c2410.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct s3c2410_nand_set { 
	char			*name;

	int			*nr_map;

	struct mtd_partition	*partitions;

	struct nand_ecclayout	*ecc_layout;

};



struct s3c2410_platform_nand {