diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-05-21 16:54:19 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-07-12 09:22:22 -0400 |
commit | 3a12b199fc820a52b8321c2b35172a1b3651120d (patch) | |
tree | 3574bdb43a5c67b818039417a1dc882cc1307720 | |
parent | 913e5bf435617aa529919a4f7567f849f9f35f9f (diff) |
[SCSI] Replace __FUNCTION__ with __func__ in iscsi_tcp.
__FUNCTION__ is gcc-specific, use __func__
(Update diff by Mike Christie)
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 91cb1fd523f0..7c4ee39a1c43 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -544,7 +544,7 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_task *task) | |||
544 | 544 | ||
545 | if (tcp_task->exp_datasn != datasn) { | 545 | if (tcp_task->exp_datasn != datasn) { |
546 | debug_tcp("%s: task->exp_datasn(%d) != rhdr->datasn(%d)\n", | 546 | debug_tcp("%s: task->exp_datasn(%d) != rhdr->datasn(%d)\n", |
547 | __FUNCTION__, tcp_task->exp_datasn, datasn); | 547 | __func__, tcp_task->exp_datasn, datasn); |
548 | return ISCSI_ERR_DATASN; | 548 | return ISCSI_ERR_DATASN; |
549 | } | 549 | } |
550 | 550 | ||
@@ -553,7 +553,7 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_task *task) | |||
553 | tcp_task->data_offset = be32_to_cpu(rhdr->offset); | 553 | tcp_task->data_offset = be32_to_cpu(rhdr->offset); |
554 | if (tcp_task->data_offset + tcp_conn->in.datalen > total_in_length) { | 554 | if (tcp_task->data_offset + tcp_conn->in.datalen > total_in_length) { |
555 | debug_tcp("%s: data_offset(%d) + data_len(%d) > total_length_in(%d)\n", | 555 | debug_tcp("%s: data_offset(%d) + data_len(%d) > total_length_in(%d)\n", |
556 | __FUNCTION__, tcp_task->data_offset, | 556 | __func__, tcp_task->data_offset, |
557 | tcp_conn->in.datalen, total_in_length); | 557 | tcp_conn->in.datalen, total_in_length); |
558 | return ISCSI_ERR_DATA_OFFSET; | 558 | return ISCSI_ERR_DATA_OFFSET; |
559 | } | 559 | } |
@@ -646,7 +646,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_task *task) | |||
646 | 646 | ||
647 | if (tcp_task->exp_datasn != r2tsn){ | 647 | if (tcp_task->exp_datasn != r2tsn){ |
648 | debug_tcp("%s: task->exp_datasn(%d) != rhdr->r2tsn(%d)\n", | 648 | debug_tcp("%s: task->exp_datasn(%d) != rhdr->r2tsn(%d)\n", |
649 | __FUNCTION__, tcp_task->exp_datasn, r2tsn); | 649 | __func__, tcp_task->exp_datasn, r2tsn); |
650 | return ISCSI_ERR_R2TSN; | 650 | return ISCSI_ERR_R2TSN; |
651 | } | 651 | } |
652 | 652 | ||
@@ -1193,7 +1193,7 @@ iscsi_tcp_send_hdr_prep(struct iscsi_conn *conn, void *hdr, size_t hdrlen) | |||
1193 | { | 1193 | { |
1194 | struct iscsi_tcp_conn *tcp_conn = conn->dd_data; | 1194 | struct iscsi_tcp_conn *tcp_conn = conn->dd_data; |
1195 | 1195 | ||
1196 | debug_tcp("%s(%p%s)\n", __FUNCTION__, tcp_conn, | 1196 | debug_tcp("%s(%p%s)\n", __func__, tcp_conn, |
1197 | conn->hdrdgst_en? ", digest enabled" : ""); | 1197 | conn->hdrdgst_en? ", digest enabled" : ""); |
1198 | 1198 | ||
1199 | /* Clear the data segment - needs to be filled in by the | 1199 | /* Clear the data segment - needs to be filled in by the |
@@ -1234,7 +1234,7 @@ iscsi_tcp_send_data_prep(struct iscsi_conn *conn, struct scatterlist *sg, | |||
1234 | struct hash_desc *tx_hash = NULL; | 1234 | struct hash_desc *tx_hash = NULL; |
1235 | unsigned int hdr_spec_len; | 1235 | unsigned int hdr_spec_len; |
1236 | 1236 | ||
1237 | debug_tcp("%s(%p, offset=%d, datalen=%d%s)\n", __FUNCTION__, | 1237 | debug_tcp("%s(%p, offset=%d, datalen=%d%s)\n", __func__, |
1238 | tcp_conn, offset, len, | 1238 | tcp_conn, offset, len, |
1239 | conn->datadgst_en? ", digest enabled" : ""); | 1239 | conn->datadgst_en? ", digest enabled" : ""); |
1240 | 1240 | ||
@@ -1259,7 +1259,7 @@ iscsi_tcp_send_linear_data_prepare(struct iscsi_conn *conn, void *data, | |||
1259 | struct hash_desc *tx_hash = NULL; | 1259 | struct hash_desc *tx_hash = NULL; |
1260 | unsigned int hdr_spec_len; | 1260 | unsigned int hdr_spec_len; |
1261 | 1261 | ||
1262 | debug_tcp("%s(%p, datalen=%d%s)\n", __FUNCTION__, tcp_conn, len, | 1262 | debug_tcp("%s(%p, datalen=%d%s)\n", __func__, tcp_conn, len, |
1263 | conn->datadgst_en? ", digest enabled" : ""); | 1263 | conn->datadgst_en? ", digest enabled" : ""); |
1264 | 1264 | ||
1265 | /* Make sure the datalen matches what the caller | 1265 | /* Make sure the datalen matches what the caller |