hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UBI: fix minor stylistic issues 

Fix checkpatch.pl errors and warnings:

* space before tab
* line over 80 characters
* include linux/ioctl.h instead of asm/ioctl.h

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Artem Bityutskiy 2011-03-28 10:12:25 +03:00
parent 3627924acf
commit feddbb34eb
8 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/ubi/cdev.c
View File

@ -115,7 +115,7 @@ static int vol_cdev_open(struct inode *inode, struct file *file)
mode = UBI_READONLY; mode = UBI_READONLY;
dbg_gen("open device %d, volume %d, mode %d", dbg_gen("open device %d, volume %d, mode %d",
ubi_num, vol_id, mode); ubi_num, vol_id, mode);
desc = ubi_open_volume(ubi_num, vol_id, mode); desc = ubi_open_volume(ubi_num, vol_id, mode);
if (IS_ERR(desc)) if (IS_ERR(desc))
@ -158,7 +158,7 @@ static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin)
loff_t new_offset; loff_t new_offset;
if (vol->updating) { if (vol->updating) {
/* Update is in progress, seeking is prohibited */ /* Update is in progress, seeking is prohibited */
dbg_err("updating"); dbg_err("updating");
return -EBUSY; return -EBUSY;
} }

18
drivers/mtd/ubi/debug.c
View File

@ -75,15 +75,15 @@ void ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
{ {
printk(KERN_DEBUG "Volume identifier header dump:\n"); printk(KERN_DEBUG "Volume identifier header dump:\n");
printk(KERN_DEBUG "\tmagic %08x\n", be32_to_cpu(vid_hdr->magic)); printk(KERN_DEBUG "\tmagic %08x\n", be32_to_cpu(vid_hdr->magic));
printk(KERN_DEBUG "\tversion %d\n", (int)vid_hdr->version); printk(KERN_DEBUG "\tversion %d\n", (int)vid_hdr->version);
printk(KERN_DEBUG "\tvol_type %d\n", (int)vid_hdr->vol_type); printk(KERN_DEBUG "\tvol_type %d\n", (int)vid_hdr->vol_type);
printk(KERN_DEBUG "\tcopy_flag %d\n", (int)vid_hdr->copy_flag); printk(KERN_DEBUG "\tcopy_flag %d\n", (int)vid_hdr->copy_flag);
printk(KERN_DEBUG "\tcompat %d\n", (int)vid_hdr->compat); printk(KERN_DEBUG "\tcompat %d\n", (int)vid_hdr->compat);
printk(KERN_DEBUG "\tvol_id %d\n", be32_to_cpu(vid_hdr->vol_id)); printk(KERN_DEBUG "\tvol_id %d\n", be32_to_cpu(vid_hdr->vol_id));
printk(KERN_DEBUG "\tlnum %d\n", be32_to_cpu(vid_hdr->lnum)); printk(KERN_DEBUG "\tlnum %d\n", be32_to_cpu(vid_hdr->lnum));
printk(KERN_DEBUG "\tdata_size %d\n", be32_to_cpu(vid_hdr->data_size)); printk(KERN_DEBUG "\tdata_size %d\n", be32_to_cpu(vid_hdr->data_size));
printk(KERN_DEBUG "\tused_ebs %d\n", be32_to_cpu(vid_hdr->used_ebs)); printk(KERN_DEBUG "\tused_ebs %d\n", be32_to_cpu(vid_hdr->used_ebs));
printk(KERN_DEBUG "\tdata_pad %d\n", be32_to_cpu(vid_hdr->data_pad)); printk(KERN_DEBUG "\tdata_pad %d\n", be32_to_cpu(vid_hdr->data_pad));
printk(KERN_DEBUG "\tsqnum %llu\n", printk(KERN_DEBUG "\tsqnum %llu\n",
(unsigned long long)be64_to_cpu(vid_hdr->sqnum)); (unsigned long long)be64_to_cpu(vid_hdr->sqnum));
printk(KERN_DEBUG "\thdr_crc %08x\n", be32_to_cpu(vid_hdr->hdr_crc)); printk(KERN_DEBUG "\thdr_crc %08x\n", be32_to_cpu(vid_hdr->hdr_crc));

4
drivers/mtd/ubi/io.c
View File

@ -189,8 +189,8 @@ retry:
} }
if (retries++ < UBI_IO_RETRIES) { if (retries++ < UBI_IO_RETRIES) {
dbg_io("error %d%s while reading %d bytes from PEB %d:%d," dbg_io("error %d%s while reading %d bytes from PEB "
" read only %zd bytes, retry", "%d:%d, read only %zd bytes, retry",
err, errstr, len, pnum, offset, read); err, errstr, len, pnum, offset, read);
yield(); yield();
goto retry; goto retry;

2
drivers/mtd/ubi/scan.c
View File

@ -1103,7 +1103,7 @@ static int check_what_we_have(struct ubi_device *ubi, struct ubi_scan_info *si)
* otherwise, only print a warning. * otherwise, only print a warning.
*/ */
if (si->corr_peb_count >= max_corr) { if (si->corr_peb_count >= max_corr) {
ubi_err("too many corrupted PEBs, refusing this device"); ubi_err("too many corrupted PEBs, refusing");
return -EINVAL; return -EINVAL;
} }
} }

4
drivers/mtd/ubi/ubi.h
View File

@ -341,8 +341,8 @@ struct ubi_wl_entry;
* protected from the wear-leveling worker) * protected from the wear-leveling worker)
* @pq_head: protection queue head * @pq_head: protection queue head
* @wl_lock: protects the @used, @free, @pq, @pq_head, @lookuptbl, @move_from, * @wl_lock: protects the @used, @free, @pq, @pq_head, @lookuptbl, @move_from,
* @move_to, @move_to_put @erase_pending, @wl_scheduled, @works, * @move_to, @move_to_put @erase_pending, @wl_scheduled, @works,
* @erroneous, and @erroneous_peb_count fields * @erroneous, and @erroneous_peb_count fields
* @move_mutex: serializes eraseblock moves * @move_mutex: serializes eraseblock moves
* @work_sem: synchronizes the WL worker with use tasks * @work_sem: synchronizes the WL worker with use tasks
* @wl_scheduled: non-zero if the wear-leveling was scheduled * @wl_scheduled: non-zero if the wear-leveling was scheduled

3
drivers/mtd/ubi/wl.c
View File

@ -1570,7 +1570,8 @@ void ubi_wl_close(struct ubi_device *ubi)
* @ec: the erase counter to check * @ec: the erase counter to check
* *
* This function returns zero if the erase counter of physical eraseblock @pnum * This function returns zero if the erase counter of physical eraseblock @pnum
* is equivalent to @ec, and a negative error code if not or if an error occurred. * is equivalent to @ec, and a negative error code if not or if an error
* occurred.
*/ */
static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec) static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec)
{ {

4
include/linux/mtd/ubi.h
View File

@ -21,7 +21,7 @@
#ifndef __LINUX_UBI_H__ #ifndef __LINUX_UBI_H__
#define __LINUX_UBI_H__ #define __LINUX_UBI_H__
#include <asm/ioctl.h> #include <linux/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
#include <mtd/ubi-user.h> #include <mtd/ubi-user.h>
@ -87,7 +87,7 @@ enum {
* physical eraseblock size and on how much bytes UBI headers consume. But * physical eraseblock size and on how much bytes UBI headers consume. But
* because of the volume alignment (@alignment), the usable size of logical * because of the volume alignment (@alignment), the usable size of logical
* eraseblocks if a volume may be less. The following equation is true: * eraseblocks if a volume may be less. The following equation is true:
* @usable_leb_size = LEB size - (LEB size mod @alignment), * @usable_leb_size = LEB size - (LEB size mod @alignment),
* where LEB size is the logical eraseblock size defined by the UBI device. * where LEB size is the logical eraseblock size defined by the UBI device.
* *
* The alignment is multiple to the minimal flash input/output unit size or %1 * The alignment is multiple to the minimal flash input/output unit size or %1

6
include/mtd/ubi-user.h
View File

@ -406,9 +406,9 @@ struct ubi_map_req {
* @value: value to set * @value: value to set
*/ */
struct ubi_set_vol_prop_req { struct ubi_set_vol_prop_req {
__u8 property; __u8 property;
__u8 padding[7]; __u8 padding[7];
__u64 value; __u64 value;
} __packed; } __packed;
#endif /* __UBI_USER_H__ */ #endif /* __UBI_USER_H__ */