[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: Jörn Engel <joern@logfs.org>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 65 insertions, 64 deletions

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 45c6f32b0bf..9cf73d360e7 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -44,8 +44,8 @@ struct mtd_part {
  * to the _real_ device.
  */
 
-static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
-                        size_t *retlen, u_char *buf)
+static int part_read(struct mtd_info *mtd, loff_t from, size_t len,
+                size_t *retlen, u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
         int res;
@@ -54,7 +54,7 @@ static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
                 len = 0;
         else if (from + len > mtd->size)
                 len = mtd->size - from;
-        res = part->master->read (part->master, from + part->offset,
+        res = part->master->read(part->master, from + part->offset,
                                    len, retlen, buf);
         if (unlikely(res)) {
                 if (res == -EUCLEAN)
@@ -65,8 +65,8 @@ static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
         return res;
 }
 
-static int part_point (struct mtd_info *mtd, loff_t from, size_t len,
-                        size_t *retlen, void **virt, resource_size_t *phys)
+static int part_point(struct mtd_info *mtd, loff_t from, size_t len,
+                size_t *retlen, void **virt, resource_size_t *phys)
 {
         struct mtd_part *part = PART(mtd);
         if (from >= mtd->size)
@@ -85,7 +85,7 @@ static void part_unpoint(struct mtd_info *mtd, loff_t from, size_t len)
 }
 
 static int part_read_oob(struct mtd_info *mtd, loff_t from,
-                         struct mtd_oob_ops *ops)
+                struct mtd_oob_ops *ops)
 {
         struct mtd_part *part = PART(mtd);
         int res;
@@ -105,38 +105,38 @@ 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,
+        return part->master->read_user_prot_reg(part->master, from,
                                         len, retlen, buf);
 }
 
-static int part_get_user_prot_info (struct mtd_info *mtd,
-                                    struct otp_info *buf, size_t len)
+static int part_get_user_prot_info(struct mtd_info *mtd,
+                struct otp_info *buf, size_t len)
 {
         struct mtd_part *part = PART(mtd);
-        return part->master->get_user_prot_info (part->master, buf, len);
+        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,
+        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);
+        return part->master->get_fact_prot_info(part->master, buf, len);
 }
 
-static int part_write (struct mtd_info *mtd, loff_t to, size_t len,
-                        size_t *retlen, const u_char *buf)
+static int part_write(struct mtd_info *mtd, loff_t to, size_t len,
+                size_t *retlen, const u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
         if (!(mtd->flags & MTD_WRITEABLE))
@@ -145,12 +145,12 @@ static int part_write (struct mtd_info *mtd, loff_t to, size_t len,
                 len = 0;
         else if (to + len > mtd->size)
                 len = mtd->size - to;
-        return part->master->write (part->master, to + part->offset,
+        return part->master->write(part->master, to + part->offset,
                                     len, retlen, buf);
 }
 
-static int part_panic_write (struct mtd_info *mtd, loff_t to, size_t len,
-                        size_t *retlen, const u_char *buf)
+static int part_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
+                size_t *retlen, const u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
         if (!(mtd->flags & MTD_WRITEABLE))
@@ -159,12 +159,12 @@ static int part_panic_write (struct mtd_info *mtd, loff_t to, size_t len,
                 len = 0;
         else if (to + len > mtd->size)
                 len = mtd->size - to;
-        return part->master->panic_write (part->master, to + part->offset,
+        return part->master->panic_write(part->master, to + part->offset,
                                     len, retlen, buf);
 }
 
 static int part_write_oob(struct mtd_info *mtd, loff_t to,
-                         struct mtd_oob_ops *ops)
+                struct mtd_oob_ops *ops)
 {
         struct mtd_part *part = PART(mtd);
 
@@ -178,31 +178,32 @@ 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,
+        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);
+        return part->master->lock_user_prot_reg(part->master, from, len);
 }
 
-static int part_writev (struct mtd_info *mtd,  const struct kvec *vecs,
-                         unsigned long count, loff_t to, size_t *retlen)
+static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,
+                unsigned long count, loff_t to, size_t *retlen)
 {
         struct mtd_part *part = PART(mtd);
         if (!(mtd->flags & MTD_WRITEABLE))
                 return -EROFS;
-        return part->master->writev (part->master, vecs, count,
+        return part->master->writev(part->master, vecs, count,
                                         to + part->offset, retlen);
 }
 
-static int part_erase (struct mtd_info *mtd, struct erase_info *instr)
+static int part_erase(struct mtd_info *mtd, struct erase_info *instr)
 {
         struct mtd_part *part = PART(mtd);
         int ret;
@@ -234,7 +235,7 @@ void mtd_erase_callback(struct erase_info *instr)
 }
 EXPORT_SYMBOL_GPL(mtd_erase_callback);
 
-static int part_lock (struct mtd_info *mtd, loff_t ofs, size_t len)
+static int part_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
 {
         struct mtd_part *part = PART(mtd);
         if ((len + ofs) > mtd->size)
@@ -242,7 +243,7 @@ static int part_lock (struct mtd_info *mtd, loff_t ofs, size_t len)
         return part->master->lock(part->master, ofs + part->offset, len);
 }
 
-static int part_unlock (struct mtd_info *mtd, loff_t ofs, size_t len)
+static int part_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
 {
         struct mtd_part *part = PART(mtd);
         if ((len + ofs) > mtd->size)
@@ -268,7 +269,7 @@ static void part_resume(struct mtd_info *mtd)
         part->master->resume(part->master);
 }
 
-static int part_block_isbad (struct mtd_info *mtd, loff_t ofs)
+static int part_block_isbad(struct mtd_info *mtd, loff_t ofs)
 {
         struct mtd_part *part = PART(mtd);
         if (ofs >= mtd->size)
@@ -277,7 +278,7 @@ static int part_block_isbad (struct mtd_info *mtd, loff_t ofs)
         return part->master->block_isbad(part->master, ofs);
 }
 
-static int part_block_markbad (struct mtd_info *mtd, loff_t ofs)
+static int part_block_markbad(struct mtd_info *mtd, loff_t ofs)
 {
         struct mtd_part *part = PART(mtd);
         int res;
@@ -305,13 +306,14 @@ int del_mtd_partitions(struct mtd_info *master)
         list_for_each_entry_safe(slave, next, &mtd_partitions, list)
                 if (slave->master == master) {
                         list_del(&slave->list);
-                        if(slave->registered)
+                        if (slave->registered)
                                 del_mtd_device(&slave->mtd);
                         kfree(slave);
                 }
 
         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,
@@ -320,9 +322,9 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
         struct mtd_part *slave;
 
         /* allocate the partition structure */
-        slave = kzalloc (sizeof(*slave), GFP_KERNEL);
+        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;
@@ -347,7 +349,7 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
         if (master->panic_write)
                 slave->mtd.panic_write = part_panic_write;
 
-        if(master->point && master->unpoint){
+        if (master->point && master->unpoint) {
                 slave->mtd.point = part_point;
                 slave->mtd.unpoint = part_unpoint;
         }
@@ -356,17 +358,17 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
                 slave->mtd.read_oob = part_read_oob;
         if (master->write_oob)
                 slave->mtd.write_oob = part_write_oob;
-        if(master->read_user_prot_reg)
+        if (master->read_user_prot_reg)
                 slave->mtd.read_user_prot_reg = part_read_user_prot_reg;
-        if(master->read_fact_prot_reg)
+        if (master->read_fact_prot_reg)
                 slave->mtd.read_fact_prot_reg = part_read_fact_prot_reg;
-        if(master->write_user_prot_reg)
+        if (master->write_user_prot_reg)
                 slave->mtd.write_user_prot_reg = part_write_user_prot_reg;
-        if(master->lock_user_prot_reg)
+        if (master->lock_user_prot_reg)
                 slave->mtd.lock_user_prot_reg = part_lock_user_prot_reg;
-        if(master->get_user_prot_info)
+        if (master->get_user_prot_info)
                 slave->mtd.get_user_prot_info = part_get_user_prot_info;
-        if(master->get_fact_prot_info)
+        if (master->get_fact_prot_info)
                 slave->mtd.get_fact_prot_info = part_get_fact_prot_info;
         if (master->sync)
                 slave->mtd.sync = part_sync;
@@ -404,7 +406,7 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
         if (slave->mtd.size == MTDPART_SIZ_FULL)
                 slave->mtd.size = master->size - slave->offset;
 
-        printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset,
+        printk(KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset,
                 slave->offset + slave->mtd.size, slave->mtd.name);
 
         /* let's do some sanity checks */
@@ -412,21 +414,21 @@ 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) {
+        if (master->numeraseregions > 1) {
                 /* Deal with variable erase size stuff */
                 int i;
                 struct mtd_erase_region_info *regions = master->eraseregions;
 
                 /* Find the first erase regions which is part of this partition. */
-                for (i=0; i < master->numeraseregions && regions[i].offset <= slave->offset; i++)
+                for (i = 0; i < master->numeraseregions && regions[i].offset <= slave->offset; i++)
                         ;
 
                 for (i--; i < master->numeraseregions && regions[i].offset < slave->offset + slave->mtd.size; i++) {
@@ -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);
         }
 
@@ -458,7 +461,7 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
         if (master->block_isbad) {
                 uint32_t offs = 0;
 
-                while(offs < slave->mtd.size) {
+                while (offs < slave->mtd.size) {
                         if (master->block_isbad(master,
                                                 offs + slave->offset))
                                 slave->mtd.ecc_stats.badblocks++;
@@ -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 {
@@ -492,7 +496,7 @@ int add_mtd_partitions(struct mtd_info *master,
         u_int32_t cur_offset = 0;
         int i;
 
-        printk (KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
+        printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
 
         for (i = 0; i < nbparts; i++) {
                 slave = add_one_partition(master, parts + i, i, cur_offset);
@@ -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);