staging: exfat: fix multiple coding-style issues
cover staging: exfat: fix multiple coding-style issues
Fix multiple coding-style issues reported by the checkpatch.pl script in the exfat module.
Roi Martin (6):
staging: exfat: remove unnecessary parentheses
staging: exfat: make alignment match open parenthesis
staging: exfat: remove unnecessary new line in if condition
staging: exfat: replace printk(KERN_INFO ...) with pr_info()
staging: exfat: avoid multiple assignments
staging: exfat: replace kmalloc with kmalloc_array
drivers/staging/exfat/exfat_core.c | 50 +++++----- drivers/staging/exfat/exfat_super.c | 136 +++++++++++++++++++--------- 2 files changed, 119 insertions(+), 67 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/6 staging: exfat: remove unnecessary parentheses
Fix checkpatch.pl warning:
CHECK: Unnecessary parentheses around ...
--- drivers/staging/exfat/exfat_core.c | 24 ++++++++-------- drivers/staging/exfat/exfat_super.c | 44 ++++++++++++++--------------- 2 files changed, 34 insertions(+), 34 deletions(-)
drivers/staging/exfat/exfat_core.c +12 -12
@@ -550,7 +550,7 @@ s32 load_alloc_bitmap(struct super_block *sb)for (j =0 ; j < p_fs->map_sectors; j++) { p_fs->vol_amap[j] =NULL ; - ret =sector_read (sb, sector + j, &(p_fs->vol_amap[j]),1 ); + ret =sector_read (sb, sector + j, &p_fs->vol_amap[j],1 );if (ret !=FFS_SUCCESS ) {/* release all buffers and free vol_amap */ i =0 ;
@@ -910,10 +910,10 @@ u32 fat_get_entry_type(struct dentry_t *p_entry) {struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry; -if (*(ep->name) ==0x0 ) +if (*ep->name ==0x0 )return TYPE_UNUSED ; -else if (*(ep->name) ==0xE5 ) +else if (*ep->name ==0xE5 )return TYPE_DELETED ;else if (ep->attr ==ATTR_EXTEND )
@@ -978,10 +978,10 @@ void fat_set_entry_type(struct dentry_t *p_entry, u32 type)struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;if (type ==TYPE_UNUSED ) - *(ep->name) =0x0 ; + *ep->name =0x0 ;else if (type ==TYPE_DELETED ) - *(ep->name) =0xE5 ; + *ep->name =0xE5 ;else if (type ==TYPE_EXTEND ) ep->attr =ATTR_EXTEND ;
@@ -1562,7 +1562,7 @@ void update_dir_checksum_with_entry_set(struct super_block *sb,u16 chksum =0 ;s32 chksum_type =CS_DIR_ENTRY , i; - ep = (struct dentry_t *)&(es->__buf); + ep = (struct dentry_t *)&es->__buf;for (i =0 ; i < es->num_entries; i++) {pr_debug ("%s ep %p\n" , __func__, ep); chksum = calc_checksum_2byte((void *)ep, DENTRY_SIZE, chksum,
@@ -1571,7 +1571,7 @@ void update_dir_checksum_with_entry_set(struct super_block *sb, chksum_type =CS_DEFAULT ; } - ep = (struct dentry_t *)&(es->__buf); + ep = (struct dentry_t *)&es->__buf;SET16_A (((struct file_dentry_t *)ep)->checksum, chksum);write_whole_entry_set (sb, es); }
@@ -1832,7 +1832,7 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb, }if (file_ep) - *file_ep = (struct dentry_t *)&(es->__buf); + *file_ep = (struct dentry_t *)&es->__buf; pr_debug("%s exiting es %p sec %llu offset %d flags %d, num_entries %u buf ptr %p\n", __func__, es, (unsigned long long)es->sector, es->offset,
@@ -1859,7 +1859,7 @@ static s32 __write_partial_entries_in_entry_set(struct super_block *sb,struct fs_info_t *p_fs = &(EXFAT_SB (sb)->fs_info);struct bd_info_t *p_bd = &(EXFAT_SB (sb)->bd_info);u32 clu; -u8 *buf, *esbuf = (u8 *)&(es->__buf); +u8 *buf, *esbuf = (u8 *)&es->__buf;pr_debug ("%s entered es %p sec %llu off %d count %d\n" , __func__, es, (unsigned long long )sec, off, count);
@@ -1929,7 +1929,7 @@ s32 write_partial_entries_in_entry_set(struct super_block *sb,struct chain_t dir;/* vaidity check */ -if (ep + count > ((struct dentry_t *)&(es->__buf)) + es->num_entries) +if (ep + count > ((struct dentry_t *)&es->__buf) + es->num_entries)return FFS_ERROR ; dir.dir =GET_CLUSTER_FROM_SECTOR (es->sector);
@@ -1938,7 +1938,7 @@ s32 write_partial_entries_in_entry_set(struct super_block *sb, byte_offset = (es->sector -START_SECTOR (dir.dir)) << p_bd->sector_size_bits; - byte_offset += ((void **)ep - &(es->__buf)) + es->offset; + byte_offset += ((void **)ep - &es->__buf) + es->offset; ret =_walk_fat_chain (sb, &dir, byte_offset, &clu);if (ret !=FFS_SUCCESS )
@@ -2122,7 +2122,7 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries p_fs->fs_func->set_entry_flag (ep, p_dir->flags);buf_modify (sb, sector); -update_dir_checksum (sb, &(fid->dir), +update_dir_checksum (sb, &fid->dir, fid->entry); } }
drivers/staging/exfat/exfat_super.c +22 -22
166 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 2/6 staging: exfat: make alignment match open parenthesis
In reply to Roi MartinFix checkpatch.pl warning:
CHECK: Alignment should match open parenthesis
--- drivers/staging/exfat/exfat_core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/exfat/exfat_core.c +6 -6
@@ -1703,7 +1703,7 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,size_t bufsize;pr_debug ("%s entered p_dir dir %u flags %x size %d\n" , - __func__, p_dir->dir, p_dir->flags, p_dir->size); + __func__, p_dir->dir, p_dir->flags, p_dir->size); byte_offset = entry <<DENTRY_SIZE_BITS ; ret =_walk_fat_chain (sb, p_dir, byte_offset, &clu);
@@ -1835,8 +1835,8 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb, *file_ep = (struct dentry_t *)&es->__buf;pr_debug ("%s exiting es %p sec %llu offset %d flags %d, num_entries %u buf ptr %p\n" , - __func__, es, (unsigned long long )es->sector, es->offset, - es->alloc_flag, es->num_entries, &es->__buf); + __func__, es, (unsigned long long )es->sector, es->offset, + es->alloc_flag, es->num_entries, &es->__buf);return es; err_out:pr_debug ("%s exited NULL (es %p)\n" , __func__, es);
@@ -1862,7 +1862,7 @@ static s32 __write_partial_entries_in_entry_set(struct super_block *sb,u8 *buf, *esbuf = (u8 *)&es->__buf;pr_debug ("%s entered es %p sec %llu off %d count %d\n" , - __func__, es, (unsigned long long )sec, off, count); + __func__, es, (unsigned long long )sec, off, count); num_entries = count;while (num_entries) {
@@ -1876,8 +1876,8 @@ static s32 __write_partial_entries_in_entry_set(struct super_block *sb, goto err_out;pr_debug ("es->buf %p buf_off %u\n" , esbuf, buf_off);pr_debug ("copying %d entries from %p to sector %llu\n" , - copy_entries, (esbuf + buf_off), - (unsigned long long )sec); + copy_entries, (esbuf + buf_off), + (unsigned long long )sec);memcpy (buf + off, esbuf + buf_off, copy_entries <<DENTRY_SIZE_BITS );buf_modify (sb, sec);
Signature · 1 line
2.20.1
PATCH 3/6 staging: exfat: remove unnecessary new line in if condition
In reply to Roi MartinFix checkpatch.pl warning:
CHECK: Logical continuations should be on the previous line
--- drivers/staging/exfat/exfat_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/exfat/exfat_core.c +1 -2
@@ -1727,8 +1727,7 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb, ep = (struct dentry_t *)(buf + off); entry_type = p_fs->fs_func->get_entry_type (ep); -if ((entry_type !=TYPE_FILE ) - && (entry_type !=TYPE_DIR )) +if ((entry_type !=TYPE_FILE ) && (entry_type !=TYPE_DIR )) goto err_out;if (type ==ES_ALL_ENTRIES )
Signature · 1 line
2.20.1
PATCH 4/6 staging: exfat: replace printk(KERN_INFO ...) with pr_info()
In reply to Roi MartinFix checkpatch.pl warning:
WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...
--- drivers/staging/exfat/exfat_super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/exfat/exfat_super.c +1 -1
@@ -396,7 +396,7 @@ static int ffsMountVol(struct super_block *sb)if (i <53 ) {#ifdef CONFIG_EXFAT_DONT_MOUNT_VFAT ret = -EINVAL ; -printk (KERN_INFO "EXFAT: Attempted to mount VFAT filesystem\n" ); +pr_info ("EXFAT: Attempted to mount VFAT filesystem\n" ); goto out;#else if (GET16 (p_pbr->bpb +11 ))/* num_fat_sectors */
Signature · 1 line
2.20.1
PATCH 5/6 staging: exfat: avoid multiple assignments
In reply to Roi MartinFix checkpatch.pl warning:
CHECK: multiple assignments should be avoided
--- drivers/staging/exfat/exfat_core.c | 3 +- drivers/staging/exfat/exfat_super.c | 90 +++++++++++++++++++++++------ 2 files changed, 73 insertions(+), 20 deletions(-)
drivers/staging/exfat/exfat_core.c +2 -1
@@ -470,7 +470,8 @@ s32 exfat_count_used_clusters(struct super_block *sb)struct fs_info_t *p_fs = &(EXFAT_SB (sb)->fs_info);struct bd_info_t *p_bd = &(EXFAT_SB (sb)->bd_info); - map_i = map_b =0 ; + map_i =0 ; + map_b =0 ;for (i =2 ; i < p_fs->num_clusters; i +=8 ) { k = *(((u8 *)p_fs->vol_amap[map_i]->b_data) + map_b);
drivers/staging/exfat/exfat_super.c +71 -19
258 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 6/6 staging: exfat: replace kmalloc with kmalloc_array
In reply to Roi MartinReplace expressions of the form:
kmalloc(count * size, GFP_KERNEL); With: kmalloc_array(count, size, GFP_KERNEL);
--- drivers/staging/exfat/exfat_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/exfat/exfat_core.c +4 -4
@@ -713,8 +713,8 @@ static s32 __load_upcase_table(struct super_block *sb, sector_t sector,u32 checksum =0 ; - upcase_table = p_fs->vol_utbl =kmalloc (UTBL_COL_COUNT *sizeof (u16 *), -GFP_KERNEL ); + upcase_table =kmalloc_array (UTBL_COL_COUNT ,sizeof (u16 *),GFP_KERNEL ); + p_fs->vol_utbl = upcase_table;if (!upcase_table)return FFS_MEMORYERR ;memset (upcase_table,0 ,UTBL_COL_COUNT *sizeof (u16 *));
@@ -793,8 +793,8 @@ static s32 __load_default_upcase_table(struct super_block *sb)u16 uni =0 ;u16 **upcase_table; - upcase_table = p_fs->vol_utbl =kmalloc (UTBL_COL_COUNT *sizeof (u16 *), -GFP_KERNEL ); + upcase_table =kmalloc_array (UTBL_COL_COUNT ,sizeof (u16 *),GFP_KERNEL ); + p_fs->vol_utbl = upcase_table;if (!upcase_table)return FFS_MEMORYERR ;memset (upcase_table,0 ,UTBL_COL_COUNT *sizeof (u16 *));
Signature · 1 line
2.20.1
Greg KH
maintainerRe: [PATCH 6/6] staging: exfat: replace kmalloc with kmalloc_array
Quoted 9 lines · Roi Martin
Replace expressions of the form:
kmalloc(count * size, GFP_KERNEL); With: kmalloc_array(count, size, GFP_KERNEL);Signed-off-by Roi Martin <[email protected]>--- drivers/staging/exfat/exfat_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
This patch failed to apply. Please fix it up and resend it as a new version.
thanks,
greg k-h
Re: [PATCH 6/6] staging: exfat: replace kmalloc with kmalloc_array
Quoted 2 lines
This patch failed to apply. Please fix it up and resend it as a new version.
I have rebased the patch against the branch "staging-testing" of the tree:
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
And sent the new version.
Thanks,
Roi Martin