diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-05-01 07:35:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 11:04:02 -0400 |
commit | 24c03d47d0481ed7b172b398f6c9b7ca1fafb9fa (patch) | |
tree | d24b94e09b12a2c16cc0cf49c273af846fcc6f13 /block/blk-core.c | |
parent | e37d05dad7ff9744efd8ea95a70d389e9a65a6fc (diff) |
block: remove remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 5d09f8c56024..b754a4a2f9bd 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -136,7 +136,7 @@ static void req_bio_endio(struct request *rq, struct bio *bio, | |||
136 | 136 | ||
137 | if (unlikely(nbytes > bio->bi_size)) { | 137 | if (unlikely(nbytes > bio->bi_size)) { |
138 | printk(KERN_ERR "%s: want %u bytes done, %u left\n", | 138 | printk(KERN_ERR "%s: want %u bytes done, %u left\n", |
139 | __FUNCTION__, nbytes, bio->bi_size); | 139 | __func__, nbytes, bio->bi_size); |
140 | nbytes = bio->bi_size; | 140 | nbytes = bio->bi_size; |
141 | } | 141 | } |
142 | 142 | ||
@@ -1566,8 +1566,7 @@ static int __end_that_request_first(struct request *req, int error, | |||
1566 | if (unlikely(bio->bi_idx >= bio->bi_vcnt)) { | 1566 | if (unlikely(bio->bi_idx >= bio->bi_vcnt)) { |
1567 | blk_dump_rq_flags(req, "__end_that"); | 1567 | blk_dump_rq_flags(req, "__end_that"); |
1568 | printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n", | 1568 | printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n", |
1569 | __FUNCTION__, bio->bi_idx, | 1569 | __func__, bio->bi_idx, bio->bi_vcnt); |
1570 | bio->bi_vcnt); | ||
1571 | break; | 1570 | break; |
1572 | } | 1571 | } |
1573 | 1572 | ||