Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9746077a71d01b8d86f5e471a3a2c8f1fa91ef94

Authored by Harvey Harrison
Committed by Linus Torvalds
1 parent 3c5afae2ba
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ufs: replace remaining __FUNCTION__ occurrences 

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 11 additions and 11 deletions Side-by-side Diff

... ... @@ -277,7 +277,7 @@
277 277 if (!page)/* it was truncated */
278 278 continue;
279 279 if (IS_ERR(page)) {/* or EIO */
280   - ufs_error(inode->i_sb, __FUNCTION__,
  280 + ufs_error(inode->i_sb, __func__,
281 281 "read of page %llu failed\n",
282 282 (unsigned long long)index);
283 283 continue;
... ... @@ -308,7 +308,7 @@
308 308 ll_rw_block(READ, 1, &bh);
309 309 wait_on_buffer(bh);
310 310 if (!buffer_uptodate(bh)) {
311   - ufs_error(inode->i_sb, __FUNCTION__,
  311 + ufs_error(inode->i_sb, __func__,
312 312 "read of block failed\n");
313 313 break;
314 314 }
... ... @@ -179,7 +179,7 @@
179 179 goto fail;
180 180 Eend:
181 181 p = (struct ufs_dir_entry *)(kaddr + offs);
182   - ufs_error(sb, __FUNCTION__,
  182 + ufs_error(sb, __func__,
183 183 "entry in directory #%lu spans the page boundary"
184 184 "offset=%lu",
185 185 dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs);
... ... @@ -284,7 +284,7 @@
284 284 kaddr += ufs_last_byte(dir, n) - reclen;
285 285 while ((char *) de <= kaddr) {
286 286 if (de->d_reclen == 0) {
287   - ufs_error(dir->i_sb, __FUNCTION__,
  287 + ufs_error(dir->i_sb, __func__,
288 288 "zero-length directory entry");
289 289 ufs_put_page(page);
290 290 goto out;
... ... @@ -356,7 +356,7 @@
356 356 goto got_it;
357 357 }
358 358 if (de->d_reclen == 0) {
359   - ufs_error(dir->i_sb, __FUNCTION__,
  359 + ufs_error(dir->i_sb, __func__,
360 360 "zero-length directory entry");
361 361 err = -EIO;
362 362 goto out_unlock;
... ... @@ -456,7 +456,7 @@
456 456 struct page *page = ufs_get_page(inode, n);
457 457  
458 458 if (IS_ERR(page)) {
459   - ufs_error(sb, __FUNCTION__,
  459 + ufs_error(sb, __func__,
460 460 "bad page in #%lu",
461 461 inode->i_ino);
462 462 filp->f_pos += PAGE_CACHE_SIZE - offset;
... ... @@ -475,7 +475,7 @@
475 475 limit = kaddr + ufs_last_byte(inode, n) - UFS_DIR_REC_LEN(1);
476 476 for ( ;(char*)de <= limit; de = ufs_next_entry(sb, de)) {
477 477 if (de->d_reclen == 0) {
478   - ufs_error(sb, __FUNCTION__,
  478 + ufs_error(sb, __func__,
479 479 "zero-length directory entry");
480 480 ufs_put_page(page);
481 481 return -EIO;
... ... @@ -536,7 +536,7 @@
536 536  
537 537 while ((char*)de < (char*)dir) {
538 538 if (de->d_reclen == 0) {
539   - ufs_error(inode->i_sb, __FUNCTION__,
  539 + ufs_error(inode->i_sb, __func__,
540 540 "zero-length directory entry");
541 541 err = -EIO;
542 542 goto out;
... ... @@ -633,7 +633,7 @@
633 633  
634 634 while ((char *)de <= kaddr) {
635 635 if (de->d_reclen == 0) {
636   - ufs_error(inode->i_sb, __FUNCTION__,
  636 + ufs_error(inode->i_sb, __func__,
637 637 "zero-length directory entry: "
638 638 "kaddr=%p, de=%p\n", kaddr, de);
639 639 goto not_empty;
... ... @@ -929,7 +929,7 @@
929 929 old_i_size = inode->i_size;
930 930 inode->i_size = 0;
931 931 if (inode->i_blocks && ufs_truncate(inode, old_i_size))
932   - ufs_warning(inode->i_sb, __FUNCTION__, "ufs_truncate failed\n");
  932 + ufs_warning(inode->i_sb, __func__, "ufs_truncate failed\n");
933 933 ufs_free_inode (inode);
934 934 unlock_kernel();
935 935 return;
... ... @@ -66,7 +66,7 @@
66 66 #ifdef CONFIG_UFS_DEBUG
67 67 # define UFSD(f, a...) { \
68 68 printk ("UFSD (%s, %d): %s:", \
69   - __FILE__, __LINE__, __FUNCTION__); \
  69 + __FILE__, __LINE__, __func__); \
70 70 printk (f, ## a); \
71 71 }
72 72 #else