Commit 073ef6b2 authored by Holger Dengler's avatar Holger Dengler Committed by Vasily Gorbik

s390/zcrypt_msgtype6: Cleanup debug code

The dynamic debugging provides function names on request. So remove
all explicit function strings.
Reviewed-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
[dengler: fix indent]
Signed-off-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent a7a88eea
...@@ -437,9 +437,8 @@ static int xcrb_msg_to_type6cprb_msgx(bool userspace, struct ap_message *ap_msg, ...@@ -437,9 +437,8 @@ static int xcrb_msg_to_type6cprb_msgx(bool userspace, struct ap_message *ap_msg,
ap_msg->flags |= AP_MSG_FLAG_ADMIN; ap_msg->flags |= AP_MSG_FLAG_ADMIN;
break; break;
default: default:
pr_debug("%s unknown CPRB minor version '%c%c'\n", pr_debug("unknown CPRB minor version '%c%c'\n",
__func__, msg->cprbx.func_id[0], msg->cprbx.func_id[0], msg->cprbx.func_id[1]);
msg->cprbx.func_id[1]);
} }
/* copy data block */ /* copy data block */
...@@ -629,9 +628,8 @@ static int convert_type86_xcrb(bool userspace, struct zcrypt_queue *zq, ...@@ -629,9 +628,8 @@ static int convert_type86_xcrb(bool userspace, struct zcrypt_queue *zq,
/* Copy CPRB to user */ /* Copy CPRB to user */
if (xcrb->reply_control_blk_length < msg->fmt2.count1) { if (xcrb->reply_control_blk_length < msg->fmt2.count1) {
pr_debug("%s reply_control_blk_length %u < required %u => EMSGSIZE\n", pr_debug("reply_control_blk_length %u < required %u => EMSGSIZE\n",
__func__, xcrb->reply_control_blk_length, xcrb->reply_control_blk_length, msg->fmt2.count1);
msg->fmt2.count1);
return -EMSGSIZE; return -EMSGSIZE;
} }
if (z_copy_to_user(userspace, xcrb->reply_control_blk_addr, if (z_copy_to_user(userspace, xcrb->reply_control_blk_addr,
...@@ -642,9 +640,8 @@ static int convert_type86_xcrb(bool userspace, struct zcrypt_queue *zq, ...@@ -642,9 +640,8 @@ static int convert_type86_xcrb(bool userspace, struct zcrypt_queue *zq,
/* Copy data buffer to user */ /* Copy data buffer to user */
if (msg->fmt2.count2) { if (msg->fmt2.count2) {
if (xcrb->reply_data_length < msg->fmt2.count2) { if (xcrb->reply_data_length < msg->fmt2.count2) {
pr_debug("%s reply_data_length %u < required %u => EMSGSIZE\n", pr_debug("reply_data_length %u < required %u => EMSGSIZE\n",
__func__, xcrb->reply_data_length, xcrb->reply_data_length, msg->fmt2.count2);
msg->fmt2.count2);
return -EMSGSIZE; return -EMSGSIZE;
} }
if (z_copy_to_user(userspace, xcrb->reply_data_addr, if (z_copy_to_user(userspace, xcrb->reply_data_addr,
...@@ -673,9 +670,8 @@ static int convert_type86_ep11_xcrb(bool userspace, struct zcrypt_queue *zq, ...@@ -673,9 +670,8 @@ static int convert_type86_ep11_xcrb(bool userspace, struct zcrypt_queue *zq,
char *data = reply->msg; char *data = reply->msg;
if (xcrb->resp_len < msg->fmt2.count1) { if (xcrb->resp_len < msg->fmt2.count1) {
pr_debug("%s resp_len %u < required %u => EMSGSIZE\n", pr_debug("resp_len %u < required %u => EMSGSIZE\n",
__func__, (unsigned int)xcrb->resp_len, (unsigned int)xcrb->resp_len, msg->fmt2.count1);
msg->fmt2.count1);
return -EMSGSIZE; return -EMSGSIZE;
} }
...@@ -875,8 +871,7 @@ static void zcrypt_msgtype6_receive(struct ap_queue *aq, ...@@ -875,8 +871,7 @@ static void zcrypt_msgtype6_receive(struct ap_queue *aq,
len = sizeof(struct type86x_reply) + t86r->length; len = sizeof(struct type86x_reply) + t86r->length;
if (len > reply->bufsize || len > msg->bufsize || if (len > reply->bufsize || len > msg->bufsize ||
len != reply->len) { len != reply->len) {
pr_debug("%s len mismatch => EMSGSIZE\n", pr_debug("len mismatch => EMSGSIZE\n");
__func__);
msg->rc = -EMSGSIZE; msg->rc = -EMSGSIZE;
goto out; goto out;
} }
...@@ -890,8 +885,7 @@ static void zcrypt_msgtype6_receive(struct ap_queue *aq, ...@@ -890,8 +885,7 @@ static void zcrypt_msgtype6_receive(struct ap_queue *aq,
len = t86r->fmt2.offset1 + t86r->fmt2.count1; len = t86r->fmt2.offset1 + t86r->fmt2.count1;
if (len > reply->bufsize || len > msg->bufsize || if (len > reply->bufsize || len > msg->bufsize ||
len != reply->len) { len != reply->len) {
pr_debug("%s len mismatch => EMSGSIZE\n", pr_debug("len mismatch => EMSGSIZE\n");
__func__);
msg->rc = -EMSGSIZE; msg->rc = -EMSGSIZE;
goto out; goto out;
} }
...@@ -941,8 +935,7 @@ static void zcrypt_msgtype6_receive_ep11(struct ap_queue *aq, ...@@ -941,8 +935,7 @@ static void zcrypt_msgtype6_receive_ep11(struct ap_queue *aq,
len = t86r->fmt2.offset1 + t86r->fmt2.count1; len = t86r->fmt2.offset1 + t86r->fmt2.count1;
if (len > reply->bufsize || len > msg->bufsize || if (len > reply->bufsize || len > msg->bufsize ||
len != reply->len) { len != reply->len) {
pr_debug("%s len mismatch => EMSGSIZE\n", pr_debug("len mismatch => EMSGSIZE\n");
__func__);
msg->rc = -EMSGSIZE; msg->rc = -EMSGSIZE;
goto out; goto out;
} }
...@@ -1154,8 +1147,8 @@ static long zcrypt_msgtype6_send_cprb(bool userspace, struct zcrypt_queue *zq, ...@@ -1154,8 +1147,8 @@ static long zcrypt_msgtype6_send_cprb(bool userspace, struct zcrypt_queue *zq,
out: out:
if (rc) if (rc)
pr_debug("%s send cprb at dev=%02x.%04x rc=%d\n", pr_debug("send cprb at dev=%02x.%04x rc=%d\n",
__func__, AP_QID_CARD(zq->queue->qid), AP_QID_CARD(zq->queue->qid),
AP_QID_QUEUE(zq->queue->qid), rc); AP_QID_QUEUE(zq->queue->qid), rc);
return rc; return rc;
} }
...@@ -1277,8 +1270,8 @@ static long zcrypt_msgtype6_send_ep11_cprb(bool userspace, struct zcrypt_queue * ...@@ -1277,8 +1270,8 @@ static long zcrypt_msgtype6_send_ep11_cprb(bool userspace, struct zcrypt_queue *
out: out:
if (rc) if (rc)
pr_debug("%s send cprb at dev=%02x.%04x rc=%d\n", pr_debug("send cprb at dev=%02x.%04x rc=%d\n",
__func__, AP_QID_CARD(zq->queue->qid), AP_QID_CARD(zq->queue->qid),
AP_QID_QUEUE(zq->queue->qid), rc); AP_QID_QUEUE(zq->queue->qid), rc);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment