diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 846483d5694922..fc68eedd3147a7 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3617,7 +3617,7 @@ xlog_recover_do_icreate_pass2(
 	if (length != mp->m_ialloc_blks &&
 	    length != mp->m_ialloc_min_blks) {
 		xfs_warn(log->l_mp,
-			 "%s: unsupported chunk length", __FUNCTION__);
+			 "%s: unsupported chunk length", __func__);
 		return -EINVAL;
 	}
 
@@ -3625,7 +3625,7 @@ xlog_recover_do_icreate_pass2(
 	if ((count >> mp->m_sb.sb_inopblog) != length) {
 		xfs_warn(log->l_mp,
 			 "%s: inconsistent inode count and chunk length",
-			 __FUNCTION__);
+			 __func__);
 		return -EINVAL;
 	}
 
diff --git a/tools/testing/radix-tree/test.c b/tools/testing/radix-tree/test.c
index a6e8099eaf4f27..b4bed562129a79 100644
--- a/tools/testing/radix-tree/test.c
+++ b/tools/testing/radix-tree/test.c
@@ -122,7 +122,7 @@ void item_full_scan(struct radix_tree_root *root, unsigned long start,
 	int nfound;
 	int i;
 
-//	printf("%s(0x%08lx, 0x%08lx, %d)\n", __FUNCTION__, start, nr, chunk);
+//	printf("%s(0x%08lx, 0x%08lx, %d)\n", __func__, start, nr, chunk);
 
 	while ((nfound = radix_tree_gang_lookup(root, (void **)items, into,
 					chunk))) {