Skip to content

Commit

Permalink
fs: Remove duplicate newlines
Browse files Browse the repository at this point in the history
Drop all duplicate newlines. No functional change.

Signed-off-by: Marek Vasut <[email protected]>
  • Loading branch information
Marek Vasut authored and trini committed Jul 15, 2024
1 parent 73a48dc commit dc5e205
Show file tree
Hide file tree
Showing 37 changed files with 0 additions and 137 deletions.
1 change: 0 additions & 1 deletion fs/btrfs/ctree.h
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ static inline u8 *btrfs_dev_extent_chunk_tree_uuid(struct btrfs_dev_extent *dev)
return (u8 *)((unsigned long)dev + ptr);
}


/* struct btrfs_extent_item */
BTRFS_SETGET_FUNCS(extent_refs, struct btrfs_extent_item, refs, 64);
BTRFS_SETGET_STACK_FUNCS(stack_extent_refs, struct btrfs_extent_item, refs, 64);
Expand Down
1 change: 0 additions & 1 deletion fs/btrfs/disk-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ static int check_tree_block(struct btrfs_fs_info *fs_info,
btrfs_header_fsid(),
BTRFS_FSID_SIZE);


if (fsid_match) {
ret = 0;
break;
Expand Down
5 changes: 0 additions & 5 deletions fs/btrfs/kernel-shared/btrfs_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
#define BTRFS_LAST_FREE_OBJECTID -256ULL
#define BTRFS_FIRST_CHUNK_TREE_OBJECTID 256ULL


/*
* The device items go into the chunk tree.
*
Expand Down Expand Up @@ -333,7 +332,6 @@
*/
#define BTRFS_STRING_ITEM_KEY 253


/* 32 bytes in various csum fields */
#define BTRFS_CSUM_SIZE 32

Expand Down Expand Up @@ -508,7 +506,6 @@ struct btrfs_free_space_header {
#define BTRFS_SUPER_FLAG_CHANGING_FSID (1ULL << 35)
#define BTRFS_SUPER_FLAG_CHANGING_FSID_V2 (1ULL << 36)


/*
* Items in the extent tree are used to record the objectid of the
* owner of the block and the number of references.
Expand All @@ -523,7 +520,6 @@ struct btrfs_extent_item_v0 {
__le32 refs;
} __attribute__ ((__packed__));


#define BTRFS_EXTENT_FLAG_DATA (1ULL << 0)
#define BTRFS_EXTENT_FLAG_TREE_BLOCK (1ULL << 1)

Expand Down Expand Up @@ -565,7 +561,6 @@ struct btrfs_extent_ref_v0 {
__le32 count;
} __attribute__ ((__packed__));


/* Dev extents record used space on individual devices.
*
* The owner field points back to the chunk allocation mapping tree that
Expand Down
1 change: 0 additions & 1 deletion fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ static int device_list_add(struct btrfs_super_block *disk_super,
}
}


if (found_transid > fs_devices->latest_trans) {
fs_devices->latest_devid = devid;
fs_devices->latest_trans = found_transid;
Expand Down
2 changes: 0 additions & 2 deletions fs/ext4/ext4_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,6 @@ int ext4fs_get_new_inode_no(void)

}


static void alloc_single_indirect_block(struct ext2_inode *file_inode,
unsigned int *total_remaining_blocks,
unsigned int *no_blks_reqd)
Expand Down Expand Up @@ -2380,7 +2379,6 @@ int ext4fs_mount(void)
if (le16_to_cpu(data->sblock.magic) != EXT2_MAGIC)
goto fail_noerr;


if (le32_to_cpu(data->sblock.revision_level) == 0) {
fs->inodesz = 128;
fs->gdsize = 32;
Expand Down
2 changes: 0 additions & 2 deletions fs/ext4/ext4_write.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
* ext4write : Based on generic ext4 protocol.
*/


#include <blk.h>
#include <log.h>
#include <malloc.h>
Expand Down Expand Up @@ -746,7 +745,6 @@ void ext4fs_deinit(void)
fs->inode_bmaps = NULL;
}


free(fs->gdtable);
fs->gdtable = NULL;
/*
Expand Down
1 change: 0 additions & 1 deletion fs/jffs2/compr_lzo.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
*/


#include <config.h>
#include <linux/stddef.h>
#include <jffs2/jffs2.h>
Expand Down
1 change: 0 additions & 1 deletion fs/jffs2/compr_rubin.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include <jffs2/jffs2.h>
#include <jffs2/compr_rubin.h>


void rubin_do_decompress(unsigned char *bits, unsigned char *in,
unsigned char *page_out, __u32 destlen)
{
Expand Down
12 changes: 0 additions & 12 deletions fs/jffs2/jffs2_1pass.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
* it should probably be dumped and replaced by something like jffs2reader!
*/


#include <config.h>
#include <malloc.h>
#include <div64.h>
Expand All @@ -126,7 +125,6 @@

#include "jffs2_private.h"


#define NODE_CHUNK 1024 /* size of memory allocation chunk in b_nodes */
#define SPIN_BLKSIZE 18 /* spin after having scanned 1<<BLKSIZE bytes */

Expand All @@ -135,7 +133,6 @@
#undef DEBUG_FRAGMENTS /* print fragment list after scan */
#undef DEBUG /* enable debugging messages */


#ifdef DEBUG
# define DEBUGF(fmt,args...) printf(fmt ,##args)
#else
Expand Down Expand Up @@ -370,14 +367,12 @@ static void *get_node_mem_onenand(u32 off, void *ext_buf)
return ret;
}


static void put_fl_mem_onenand(void *buf)
{
free(buf);
}
#endif


#if defined(CONFIG_CMD_FLASH)
#include <flash.h>

Expand Down Expand Up @@ -414,7 +409,6 @@ static inline void *get_node_mem_nor(u32 off, void *ext_buf)
}
#endif


/*
* Generic jffs2 raw memory and node read routines.
*
Expand Down Expand Up @@ -515,7 +509,6 @@ struct mem_block {
struct b_node nodes[NODE_CHUNK];
};


static void
free_nodes(struct b_list *list)
{
Expand Down Expand Up @@ -1854,7 +1847,6 @@ jffs2_1pass_build_lists(struct part_info * part)
return 1;
}


static u32
jffs2_1pass_fill_info(struct b_lists * pL, struct b_jffs2_info * piL)
{
Expand Down Expand Up @@ -1883,7 +1875,6 @@ jffs2_1pass_fill_info(struct b_lists * pL, struct b_jffs2_info * piL)
return 0;
}


static struct b_lists *
jffs2_get_list(struct part_info * part, const char *who)
{
Expand All @@ -1899,7 +1890,6 @@ jffs2_get_list(struct part_info * part, const char *who)
return (struct b_lists *)part->jffs2_priv;
}


/* Print directory / file contents */
u32
jffs2_1pass_ls(struct part_info * part, const char *fname)
Expand All @@ -1916,7 +1906,6 @@ jffs2_1pass_ls(struct part_info * part, const char *fname)
return 0;
}


#if 0
putLabeledWord("found file at inode = ", inode);
putLabeledWord("read_inode returns = ", ret);
Expand All @@ -1925,7 +1914,6 @@ jffs2_1pass_ls(struct part_info * part, const char *fname)
return ret;
}


/* Load a file from flash into memory. fname can be a full path */
u32
jffs2_1pass_load(char *dest, struct part_info * part, const char *fname)
Expand Down
1 change: 0 additions & 1 deletion fs/jffs2/jffs2_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include <jffs2/jffs2.h>


struct b_node {
u32 offset;
struct b_node *next;
Expand Down
2 changes: 0 additions & 2 deletions fs/jffs2/mini_inflate.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,9 @@ static void decompress_fixed(struct bitstream *stream, unsigned char *dest)
cramfs_memset(distance->lengths, 5, 32);
distance->count[5] = 32;


fill_code_tables(lengths);
fill_code_tables(distance);


decompress_huffman(stream, dest);
}

Expand Down
1 change: 0 additions & 1 deletion fs/ubifs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -2452,7 +2452,6 @@ struct super_block *sget(struct file_system_type *type,

EXPORT_SYMBOL(sget);


static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags,
const char *name, void *data)
{
Expand Down
1 change: 0 additions & 1 deletion fs/ubifs/ubifs.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ static struct ubifs_compressor zstd_compr = {
/* All UBIFS compressors */
struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT] = {NULL};


#ifdef __UBOOT__

struct crypto_comp {
Expand Down
2 changes: 0 additions & 2 deletions fs/yaffs2/yaffs_attribs.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

#include "yaffs_attribs.h"


void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
{
obj->yst_uid = oh->yst_uid;
Expand All @@ -24,7 +23,6 @@ void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
obj->yst_rdev = oh->yst_rdev;
}


void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj)
{
#ifdef CONFIG_YAFFS_WINCE
Expand Down
1 change: 0 additions & 1 deletion fs/yaffs2/yaffs_ecc.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ static const unsigned char column_parity_table[] = {
0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
};


/* Calculate the ECC for a 256-byte block of data */
void yaffs_ecc_calc(const unsigned char *data, unsigned char *ecc)
{
Expand Down
1 change: 0 additions & 1 deletion fs/yaffs2/yaffs_flashif.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#ifndef __YAFFS_FLASH_H__
#define __YAFFS_FLASH_H__


#include "yaffs_guts.h"
int yflash_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber);
int yflash_WriteChunkToNAND(struct yaffs_dev *dev, int nand_chunk,
Expand Down
1 change: 0 additions & 1 deletion fs/yaffs2/yaffs_flashif2.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#ifndef __YAFFS_FLASH2_H__
#define __YAFFS_FLASH2_H__


#include "yaffs_guts.h"
int yflash2_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber);
int yflash2_WriteChunkToNAND(struct yaffs_dev *dev, int nand_chunk,
Expand Down
13 changes: 0 additions & 13 deletions fs/yaffs2/yaffs_guts.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
const u8 *buffer, int n_bytes, int use_reserve);



/* Function to calculate chunk and offset */

void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
Expand Down Expand Up @@ -355,7 +353,6 @@ static int yaffs_verify_chunk_written(struct yaffs_dev *dev,
return retval;
}


int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks)
{
int reserved_chunks;
Expand Down Expand Up @@ -1989,7 +1986,6 @@ static struct yaffs_obj *yaffs_create_fake_dir(struct yaffs_dev *dev,

}


static void yaffs_init_tnodes_and_objs(struct yaffs_dev *dev)
{
int i;
Expand Down Expand Up @@ -2233,8 +2229,6 @@ struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR * name,

}



/*---------------------- Block Management and Page Allocation -------------*/

static void yaffs_deinit_blocks(struct yaffs_dev *dev)
Expand Down Expand Up @@ -2292,7 +2286,6 @@ static int yaffs_init_blocks(struct yaffs_dev *dev)
if (!dev->chunk_bits)
goto alloc_error;


memset(dev->block_info, 0, n_blocks * sizeof(struct yaffs_block_info));
memset(dev->chunk_bits, 0, dev->chunk_bit_stride * n_blocks);
return YAFFS_OK;
Expand All @@ -2302,7 +2295,6 @@ static int yaffs_init_blocks(struct yaffs_dev *dev)
return YAFFS_FAIL;
}


void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no)
{
struct yaffs_block_info *bi = yaffs_get_block_info(dev, block_no);
Expand Down Expand Up @@ -3036,8 +3028,6 @@ static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,

}



static int yaffs_do_xattrib_mod(struct yaffs_obj *obj, int set,
const YCHAR *name, const void *value, int size,
int flags)
Expand Down Expand Up @@ -3396,7 +3386,6 @@ int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force,
bi->has_shrink_hdr = 1;
}


return new_chunk_id;
}

Expand Down Expand Up @@ -3804,7 +3793,6 @@ int yaffs_flush_file(struct yaffs_obj *in, int update_time, int data_sync)
YAFFS_OK : YAFFS_FAIL;
}


/* yaffs_del_file deletes the whole file data
* and the inode associated with the file.
* It does not delete the links associated with the file.
Expand Down Expand Up @@ -4306,7 +4294,6 @@ static void yaffs_empty_l_n_f(struct yaffs_dev *dev)
yaffs_del_dir_contents(dev->lost_n_found);
}


struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory,
const YCHAR *name)
{
Expand Down
4 changes: 0 additions & 4 deletions fs/yaffs2/yaffs_guts.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@
#define YAFFS_MIN_YAFFS2_CHUNK_SIZE 1024
#define YAFFS_MIN_YAFFS2_SPARE_SIZE 32



#define YAFFS_ALLOCATION_NOBJECTS 100
#define YAFFS_ALLOCATION_NTNODES 100
#define YAFFS_ALLOCATION_NLINKS 100
Expand Down Expand Up @@ -155,7 +153,6 @@ union yaffs_tags_union {
u8 as_bytes[8];
};


/* Stuff used for extended tags in YAFFS2 */

enum yaffs_ecc_result {
Expand Down Expand Up @@ -969,5 +966,4 @@ void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize);
loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh);
loff_t yaffs_max_file_size(struct yaffs_dev *dev);


#endif
Loading

0 comments on commit dc5e205

Please sign in to comment.