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

Commit 9c9ec147 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: fix checkpatch.pl errors and warnings 



Just out or curiousity ran checkpatch.pl for whole UBI,
and discovered there are quite a few of stylistic issues.
Fix them.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 4d88de4b

drivers/mtd/ubi/build.c

+4 −4
Original line number Diff line number Diff line
@@ -51,14 +51,13 @@ 
 * @name: MTD device name or number string

 * @vid_hdr_offs: VID header offset

 */

struct mtd_dev_param

{

struct mtd_dev_param {

	char name[MTD_PARAM_LEN_MAX];

	int vid_hdr_offs;

};



/* Numbers of elements set in the @mtd_dev_param array */

static int mtd_devs = 0;

static int mtd_devs;



/* MTD devices specification parameters */

static struct mtd_dev_param mtd_dev_param[UBI_MAX_DEVICES];
@@ -781,7 +780,8 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset) 
			if (!ubi_devices[ubi_num])

				break;

		if (ubi_num == UBI_MAX_DEVICES) {

			dbg_err("only %d UBI devices may be created", UBI_MAX_DEVICES);

			dbg_err("only %d UBI devices may be created",

				UBI_MAX_DEVICES);

			return -ENFILE;

		}

	} else {

drivers/mtd/ubi/cdev.c

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#include <linux/stat.h>

#include <linux/ioctl.h>

#include <linux/capability.h>

#include <linux/uaccess.h>

#include <linux/smp_lock.h>

#include <mtd/ubi-user.h>

#include <asm/uaccess.h>

#include <asm/div64.h>

#include "ubi.h"
@@ -352,7 +352,7 @@ static ssize_t vol_cdev_direct_write(struct file *file, const char __user *buf, 
}



#else

#define vol_cdev_direct_write(file, buf, count, offp) -EPERM

#define vol_cdev_direct_write(file, buf, count, offp) (-EPERM)

#endif /* CONFIG_MTD_UBI_DEBUG_USERSPACE_IO */



static ssize_t vol_cdev_write(struct file *file, const char __user *buf,

drivers/mtd/ubi/eba.c

+2 −5
Original line number Diff line number Diff line
@@ -189,9 +189,7 @@ static struct ubi_ltree_entry *ltree_add_entry(struct ubi_device *ubi, 
	le->users += 1;

	spin_unlock(&ubi->ltree_lock);



	if (le_free)

	kfree(le_free);



	return le;

}
@@ -503,9 +501,8 @@ static int recover_peb(struct ubi_device *ubi, int pnum, int vol_id, int lnum, 
	struct ubi_vid_hdr *vid_hdr;



	vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_NOFS);

	if (!vid_hdr) {

	if (!vid_hdr)

		return -ENOMEM;

	}



	mutex_lock(&ubi->buf_mutex);

drivers/mtd/ubi/io.c

+4 −4
Original line number Diff line number Diff line
@@ -705,8 +705,8 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum, 


	if (hdr_crc != crc) {

		if (verbose) {

			ubi_warn("bad EC header CRC at PEB %d, calculated %#08x,"

				 " read %#08x", pnum, crc, hdr_crc);

			ubi_warn("bad EC header CRC at PEB %d, calculated "

				 "%#08x, read %#08x", pnum, crc, hdr_crc);

			ubi_dbg_dump_ec_hdr(ec_hdr);

		}

		return UBI_IO_BAD_EC_HDR;

drivers/mtd/ubi/scan.c

+5 −4
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ static int compare_lebs(struct ubi_device *ubi, const struct ubi_scan_leb *seb, 
	unsigned long long sqnum2 = be64_to_cpu(vid_hdr->sqnum);



	if (seb->sqnum == 0 && sqnum2 == 0) {

		long long abs, v1 = seb->leb_ver, v2 = be32_to_cpu(vid_hdr->leb_ver);

		long long abs;

		long long v1 = seb->leb_ver, v2 = be32_to_cpu(vid_hdr->leb_ver);



		/*

		 * UBI constantly increases the logical eraseblock version
@@ -752,7 +753,8 @@ struct ubi_scan_leb *ubi_scan_get_free_peb(struct ubi_device *ubi, 
 * This function returns a zero if the physical eraseblock was successfully

 * handled and a negative error code in case of failure.

 */

static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si, int pnum)

static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,

		      int pnum)

{

	long long uninitialized_var(ec);

	int err, bitflips = 0, vol_id, ec_corr = 0;
@@ -1301,8 +1303,7 @@ static int paranoid_check_si(struct ubi_device *ubi, struct ubi_scan_info *si) 
		if (err < 0) {

			kfree(buf);

			return err;

		}

		else if (err)

		} else if (err)

			buf[pnum] = 1;

	}