Commit 32e68bea authored by Linus Walleij's avatar Linus Walleij Committed by Richard Weinberger
Browse files

mtd: afs: factor the IIS read into partition parser 



Factor the IIS (Image Information Structure) reading into the
partition parser, giving us a single, clean partition parser
function.

Cc: Ryan Harkin <ryan.harkin@linaro.org>
Acked-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent ff827b4e

drivers/mtd/parsers/afs.c

+20 −39
Original line number Diff line number Diff line
@@ -88,42 +88,6 @@ static bool afs_is_v1(struct mtd_info *mtd, u_int off) 
	return (magic == AFSV1_FOOTER_MAGIC);

}



static int

afs_read_iis_v1(struct mtd_info *mtd, struct image_info_v1 *iis, u_int ptr)

{

	size_t sz;

	int ret, i;



	memset(iis, 0, sizeof(*iis));

	ret = mtd_read(mtd, ptr, sizeof(*iis), &sz, (u_char *)iis);

	if (ret < 0)

		goto failed;



	if (sz != sizeof(*iis)) {

		ret = -EINVAL;

		goto failed;

	}



	ret = 0;



	/*

	 * Validate the name - it must be NUL terminated.

	 */

	for (i = 0; i < sizeof(iis->name); i++)

		if (iis->name[i] == '\0')

			break;



	if (i < sizeof(iis->name))

		ret = 1;



	return ret;



 failed:

	printk(KERN_ERR "AFS: mtd read failed at 0x%x: %d\n",

		ptr, ret);

	return ret;

}



static int afs_parse_v1_partition(struct mtd_info *mtd,

				  u_int off, struct mtd_partition *part)

{
@@ -139,6 +103,7 @@ static int afs_parse_v1_partition(struct mtd_info *mtd, 
	u_int ptr;

	size_t sz;

	int ret;

	int i;



	/*

	 * This is the address mask; we use this to mask off out of
@@ -185,9 +150,25 @@ static int afs_parse_v1_partition(struct mtd_info *mtd, 
		return 0;



	/* Read the image info block */

	ret = afs_read_iis_v1(mtd, &iis, iis_ptr);

	if (ret < 0)

		return ret;

	memset(&iis, 0, sizeof(iis));

	ret = mtd_read(mtd, iis_ptr, sizeof(iis), &sz, (u_char *)&iis);

	if (ret < 0) {

		printk(KERN_ERR "AFS: mtd read failed at 0x%x: %d\n",

		       iis_ptr, ret);

		return -EINVAL;

	}



	if (sz != sizeof(iis))

		return -EINVAL;



	/*

	 * Validate the name - it must be NUL terminated.

	 */

	for (i = 0; i < sizeof(iis.name); i++)

		if (iis.name[i] == '\0')

			break;

	if (i > sizeof(iis.name))

		return -EINVAL;



	part->name = kstrdup(iis.name, GFP_KERNEL);

	if (!part->name)