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

Commit b33a2887 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by David Woodhouse
Browse files

[MTD][MTDPART] Handle most checkpatch findings 



Remaining are 12 warnings about long lines and 1 about braces that
could be argued about.

Signed-off-by: default avatarJörn Engel <joern@logfs.org>
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 7788ba71

drivers/mtd/mtdpart.c

+65 −64
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from, 
	return res;

}



static int part_read_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,

			size_t *retlen, u_char *buf)

static int part_read_user_prot_reg(struct mtd_info *mtd, loff_t from,

		size_t len, size_t *retlen, u_char *buf)

{

	struct mtd_part *part = PART(mtd);

	return part->master->read_user_prot_reg(part->master, from,
@@ -120,16 +120,16 @@ static int part_get_user_prot_info (struct mtd_info *mtd, 
	return part->master->get_user_prot_info(part->master, buf, len);

}



static int part_read_fact_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,

			size_t *retlen, u_char *buf)

static int part_read_fact_prot_reg(struct mtd_info *mtd, loff_t from,

		size_t len, size_t *retlen, u_char *buf)

{

	struct mtd_part *part = PART(mtd);

	return part->master->read_fact_prot_reg(part->master, from,

					len, retlen, buf);

}



static int part_get_fact_prot_info (struct mtd_info *mtd,

				    struct otp_info *buf, size_t len)

static int part_get_fact_prot_info(struct mtd_info *mtd, struct otp_info *buf,

		size_t len)

{

	struct mtd_part *part = PART(mtd);

	return part->master->get_fact_prot_info(part->master, buf, len);
@@ -178,15 +178,16 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to, 
	return part->master->write_oob(part->master, to + part->offset, ops);

}



static int part_write_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,

			size_t *retlen, u_char *buf)

static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from,

		size_t len, size_t *retlen, u_char *buf)

{

	struct mtd_part *part = PART(mtd);

	return part->master->write_user_prot_reg(part->master, from,

					len, retlen, buf);

}



static int part_lock_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len)

static int part_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,

		size_t len)

{

	struct mtd_part *part = PART(mtd);

	return part->master->lock_user_prot_reg(part->master, from, len);
@@ -312,6 +313,7 @@ int del_mtd_partitions(struct mtd_info *master) 


	return 0;

}

EXPORT_SYMBOL(del_mtd_partitions);



static struct mtd_part *add_one_partition(struct mtd_info *master,

		const struct mtd_partition *part, int partno,
@@ -322,7 +324,7 @@ static struct mtd_part *add_one_partition(struct mtd_info *master, 
	/* allocate the partition structure */

	slave = kzalloc(sizeof(*slave), GFP_KERNEL);

	if (!slave) {

		printk("memory allocation error while creating partitions for \"%s\"\n",

		printk(KERN_ERR"memory allocation error while creating partitions for \"%s\"\n",

			master->name);

		del_mtd_partitions(master);

		return NULL;
@@ -412,12 +414,12 @@ static struct mtd_part *add_one_partition(struct mtd_info *master, 
			/* let's register it anyway to preserve ordering */

		slave->offset = 0;

		slave->mtd.size = 0;

		printk ("mtd: partition \"%s\" is out of reach -- disabled\n",

		printk(KERN_ERR"mtd: partition \"%s\" is out of reach -- disabled\n",

			part->name);

	}

	if (slave->offset + slave->mtd.size > master->size) {

		slave->mtd.size = master->size - slave->offset;

		printk ("mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#x\n",

		printk(KERN_WARNING"mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#x\n",

			part->name, master->name, slave->mtd.size);

	}

	if (master->numeraseregions > 1) {
@@ -442,15 +444,16 @@ static struct mtd_part *add_one_partition(struct mtd_info *master, 
	if ((slave->mtd.flags & MTD_WRITEABLE) &&

	    (slave->offset % slave->mtd.erasesize)) {

		/* Doesn't start on a boundary of major erase size */

		/* FIXME: Let it be writable if it is on a boundary of _minor_ erase size though */

		/* FIXME: Let it be writable if it is on a boundary of

		 * _minor_ erase size though */

		slave->mtd.flags &= ~MTD_WRITEABLE;

		printk ("mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",

		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",

			part->name);

	}

	if ((slave->mtd.flags & MTD_WRITEABLE) &&

	    (slave->mtd.size % slave->mtd.erasesize)) {

		slave->mtd.flags &= ~MTD_WRITEABLE;

		printk ("mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",

		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",

			part->name);

	}
@@ -466,7 +469,8 @@ static struct mtd_part *add_one_partition(struct mtd_info *master, 
		}

	}



	if(part->mtdp) {	/* store the object pointer (caller may or may not register it */

	if (part->mtdp) {

		/* store the object pointer (caller may or may not register it*/

		*part->mtdp = &slave->mtd;

		slave->registered = 0;

	} else {
@@ -503,9 +507,7 @@ int add_mtd_partitions(struct mtd_info *master, 


	return 0;

}



EXPORT_SYMBOL(add_mtd_partitions);

EXPORT_SYMBOL(del_mtd_partitions);



static DEFINE_SPINLOCK(part_parser_lock);

static LIST_HEAD(part_parsers);
@@ -535,6 +537,7 @@ int register_mtd_parser(struct mtd_part_parser *p) 


	return 0;

}

EXPORT_SYMBOL_GPL(register_mtd_parser);



int deregister_mtd_parser(struct mtd_part_parser *p)

{
@@ -543,6 +546,7 @@ int deregister_mtd_parser(struct mtd_part_parser *p) 
	spin_unlock(&part_parser_lock);

	return 0;

}

EXPORT_SYMBOL_GPL(deregister_mtd_parser);



int parse_mtd_partitions(struct mtd_info *master, const char **types,

			 struct mtd_partition **pparts, unsigned long origin)
@@ -570,7 +574,4 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types, 
	}

	return ret;

}



EXPORT_SYMBOL_GPL(parse_mtd_partitions);
 
EXPORT_SYMBOL_GPL(register_mtd_parser);

EXPORT_SYMBOL_GPL(deregister_mtd_parser);