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-settings.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-settings.c')
-rw-r--r-- | block/blk-settings.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 6089384ab064..bb93d4c32775 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
@@ -168,8 +168,8 @@ void blk_queue_max_sectors(struct request_queue *q, unsigned int max_sectors) | |||
168 | { | 168 | { |
169 | if ((max_sectors << 9) < PAGE_CACHE_SIZE) { | 169 | if ((max_sectors << 9) < PAGE_CACHE_SIZE) { |
170 | max_sectors = 1 << (PAGE_CACHE_SHIFT - 9); | 170 | max_sectors = 1 << (PAGE_CACHE_SHIFT - 9); |
171 | printk(KERN_INFO "%s: set to minimum %d\n", __FUNCTION__, | 171 | printk(KERN_INFO "%s: set to minimum %d\n", |
172 | max_sectors); | 172 | __func__, max_sectors); |
173 | } | 173 | } |
174 | 174 | ||
175 | if (BLK_DEF_MAX_SECTORS > max_sectors) | 175 | if (BLK_DEF_MAX_SECTORS > max_sectors) |
@@ -196,8 +196,8 @@ void blk_queue_max_phys_segments(struct request_queue *q, | |||
196 | { | 196 | { |
197 | if (!max_segments) { | 197 | if (!max_segments) { |
198 | max_segments = 1; | 198 | max_segments = 1; |
199 | printk(KERN_INFO "%s: set to minimum %d\n", __FUNCTION__, | 199 | printk(KERN_INFO "%s: set to minimum %d\n", |
200 | max_segments); | 200 | __func__, max_segments); |
201 | } | 201 | } |
202 | 202 | ||
203 | q->max_phys_segments = max_segments; | 203 | q->max_phys_segments = max_segments; |
@@ -220,8 +220,8 @@ void blk_queue_max_hw_segments(struct request_queue *q, | |||
220 | { | 220 | { |
221 | if (!max_segments) { | 221 | if (!max_segments) { |
222 | max_segments = 1; | 222 | max_segments = 1; |
223 | printk(KERN_INFO "%s: set to minimum %d\n", __FUNCTION__, | 223 | printk(KERN_INFO "%s: set to minimum %d\n", |
224 | max_segments); | 224 | __func__, max_segments); |
225 | } | 225 | } |
226 | 226 | ||
227 | q->max_hw_segments = max_segments; | 227 | q->max_hw_segments = max_segments; |
@@ -241,8 +241,8 @@ void blk_queue_max_segment_size(struct request_queue *q, unsigned int max_size) | |||
241 | { | 241 | { |
242 | if (max_size < PAGE_CACHE_SIZE) { | 242 | if (max_size < PAGE_CACHE_SIZE) { |
243 | max_size = PAGE_CACHE_SIZE; | 243 | max_size = PAGE_CACHE_SIZE; |
244 | printk(KERN_INFO "%s: set to minimum %d\n", __FUNCTION__, | 244 | printk(KERN_INFO "%s: set to minimum %d\n", |
245 | max_size); | 245 | __func__, max_size); |
246 | } | 246 | } |
247 | 247 | ||
248 | q->max_segment_size = max_size; | 248 | q->max_segment_size = max_size; |
@@ -357,8 +357,8 @@ void blk_queue_segment_boundary(struct request_queue *q, unsigned long mask) | |||
357 | { | 357 | { |
358 | if (mask < PAGE_CACHE_SIZE - 1) { | 358 | if (mask < PAGE_CACHE_SIZE - 1) { |
359 | mask = PAGE_CACHE_SIZE - 1; | 359 | mask = PAGE_CACHE_SIZE - 1; |
360 | printk(KERN_INFO "%s: set to minimum %lx\n", __FUNCTION__, | 360 | printk(KERN_INFO "%s: set to minimum %lx\n", |
361 | mask); | 361 | __func__, mask); |
362 | } | 362 | } |
363 | 363 | ||
364 | q->seg_boundary_mask = mask; | 364 | q->seg_boundary_mask = mask; |