diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-07-04 02:47:27 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-07-27 10:31:49 -0400 |
commit | cadbd4a5e36dde7e6c49b587b2c419103c0b7218 (patch) | |
tree | c44ec1b85a132ef5af452a6c26037c3efba4bcca /drivers/scsi/scsi_lib.c | |
parent | 2b142900784c6e38c8d39fa57d5f95ef08e735d8 (diff) |
[SCSI] replace __FUNCTION__ with __func__
[jejb: fixed up a ton of missed conversions.
All of you are on notice this has happened, driver trees will now
need to be rebased]
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: SCSI List <linux-scsi@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 6d62be664d55..ff5d56b3ee4d 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -1395,7 +1395,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) | |||
1395 | 1395 | ||
1396 | if (unlikely(cmd == NULL)) { | 1396 | if (unlikely(cmd == NULL)) { |
1397 | printk(KERN_CRIT "impossible request in %s.\n", | 1397 | printk(KERN_CRIT "impossible request in %s.\n", |
1398 | __FUNCTION__); | 1398 | __func__); |
1399 | BUG(); | 1399 | BUG(); |
1400 | } | 1400 | } |
1401 | 1401 | ||
@@ -1519,7 +1519,7 @@ static void scsi_request_fn(struct request_queue *q) | |||
1519 | printk(KERN_CRIT "impossible request in %s.\n" | 1519 | printk(KERN_CRIT "impossible request in %s.\n" |
1520 | "please mail a stack trace to " | 1520 | "please mail a stack trace to " |
1521 | "linux-scsi@vger.kernel.org\n", | 1521 | "linux-scsi@vger.kernel.org\n", |
1522 | __FUNCTION__); | 1522 | __func__); |
1523 | blk_dump_rq_flags(req, "foo"); | 1523 | blk_dump_rq_flags(req, "foo"); |
1524 | BUG(); | 1524 | BUG(); |
1525 | } | 1525 | } |
@@ -2529,7 +2529,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count, | |||
2529 | if (unlikely(i == sg_count)) { | 2529 | if (unlikely(i == sg_count)) { |
2530 | printk(KERN_ERR "%s: Bytes in sg: %zu, requested offset %zu, " | 2530 | printk(KERN_ERR "%s: Bytes in sg: %zu, requested offset %zu, " |
2531 | "elements %d\n", | 2531 | "elements %d\n", |
2532 | __FUNCTION__, sg_len, *offset, sg_count); | 2532 | __func__, sg_len, *offset, sg_count); |
2533 | WARN_ON(1); | 2533 | WARN_ON(1); |
2534 | return NULL; | 2534 | return NULL; |
2535 | } | 2535 | } |