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

Commit 8e24eea7 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

fs: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 530b6412

fs/adfs/adfs.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ extern unsigned int adfs_map_free(struct super_block *sb); 
/* Misc */

void __adfs_error(struct super_block *sb, const char *function,

		  const char *fmt, ...);

#define adfs_error(sb, fmt...) __adfs_error(sb, __FUNCTION__, fmt)

#define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt)



/* super.c */

fs/autofs4/autofs_i.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
/* #define DEBUG */



#ifdef DEBUG

#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current->pid , __FUNCTION__ , ##args); } while(0)

#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current->pid , __func__ , ##args); } while(0)

#else

#define DPRINTK(fmt,args...) do {} while(0)

#endif

fs/bfs/bfs.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode) 




#define printf(format, args...) \

	printk(KERN_ERR "BFS-fs: %s(): " format, __FUNCTION__, ## args)

	printk(KERN_ERR "BFS-fs: %s(): " format, __func__, ## args)



/* inode.c */

extern struct inode *bfs_iget(struct super_block *sb, unsigned long ino);

fs/buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ grow_buffers(struct block_device *bdev, sector_t block, int size) 


		printk(KERN_ERR "%s: requested out-of-range block %llu for "

			"device %s\n",

			__FUNCTION__, (unsigned long long)block,

			__func__, (unsigned long long)block,

			bdevname(bdev, b));

		return -EIO;

	}

fs/configfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *pp 
			goto out;

	}

	pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",

		 __FUNCTION__, count, *ppos, buffer->page);

		 __func__, count, *ppos, buffer->page);

	retval = simple_read_from_buffer(buf, count, ppos, buffer->page,

					 buffer->count);

out: