s390/zcrypt_msgtype6: Cleanup debug code

The dynamic debugging provides function names on request. So remove
all explicit function strings.

Reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
[dengler: fix indent]
Signed-off-by: Holger Dengler <dengler@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/crypto/zcrypt_msgtype6.c b/drivers/s390/crypto/zcrypt_msgtype6.c
index 215f257d2360d0021c3e12868da0967a8e6de494..b64c9d9fc6137e3b5c7b2a3bc6a894fd8fe21989 100644 (file)
--- a/drivers/s390/crypto/zcrypt_msgtype6.c
+++ b/drivers/s390/crypto/zcrypt_msgtype6.c
@@ -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;
                break;
        default:
-               pr_debug("%s unknown CPRB minor version '%c%c'\n",
-                        __func__, msg->cprbx.func_id[0],
-                        msg->cprbx.func_id[1]);
+               pr_debug("unknown CPRB minor version '%c%c'\n",
+                        msg->cprbx.func_id[0], msg->cprbx.func_id[1]);
        }
 
        /* copy data block */
@@ -629,9 +628,8 @@ static int convert_type86_xcrb(bool userspace, struct zcrypt_queue *zq,
 
        /* Copy CPRB to user */
        if (xcrb->reply_control_blk_length < msg->fmt2.count1) {
-               pr_debug("%s reply_control_blk_length %u < required %u => EMSGSIZE\n",
-                        __func__, xcrb->reply_control_blk_length,
-                        msg->fmt2.count1);
+               pr_debug("reply_control_blk_length %u < required %u => EMSGSIZE\n",
+                        xcrb->reply_control_blk_length, msg->fmt2.count1);
                return -EMSGSIZE;
        }
        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,
        /* Copy data buffer to user */
        if (msg->fmt2.count2) {
                if (xcrb->reply_data_length < msg->fmt2.count2) {
-                       pr_debug("%s reply_data_length %u < required %u => EMSGSIZE\n",
-                                __func__, xcrb->reply_data_length,
-                                msg->fmt2.count2);
+                       pr_debug("reply_data_length %u < required %u => EMSGSIZE\n",
+                                xcrb->reply_data_length, msg->fmt2.count2);
                        return -EMSGSIZE;
                }
                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,
        char *data = reply->msg;
 
        if (xcrb->resp_len < msg->fmt2.count1) {
-               pr_debug("%s resp_len %u < required %u => EMSGSIZE\n",
-                        __func__, (unsigned int)xcrb->resp_len,
-                        msg->fmt2.count1);
+               pr_debug("resp_len %u < required %u => EMSGSIZE\n",
+                        (unsigned int)xcrb->resp_len, msg->fmt2.count1);
                return -EMSGSIZE;
        }
 
@@ -875,8 +871,7 @@ static void zcrypt_msgtype6_receive(struct ap_queue *aq,
                        len = sizeof(struct type86x_reply) + t86r->length;
                        if (len > reply->bufsize || len > msg->bufsize ||
                            len != reply->len) {
-                               pr_debug("%s len mismatch => EMSGSIZE\n",
-                                        __func__);
+                               pr_debug("len mismatch => EMSGSIZE\n");
                                msg->rc = -EMSGSIZE;
                                goto out;
                        }
@@ -890,8 +885,7 @@ static void zcrypt_msgtype6_receive(struct ap_queue *aq,
                                len = t86r->fmt2.offset1 + t86r->fmt2.count1;
                        if (len > reply->bufsize || len > msg->bufsize ||
                            len != reply->len) {
-                               pr_debug("%s len mismatch => EMSGSIZE\n",
-                                        __func__);
+                               pr_debug("len mismatch => EMSGSIZE\n");
                                msg->rc = -EMSGSIZE;
                                goto out;
                        }
@@ -941,8 +935,7 @@ static void zcrypt_msgtype6_receive_ep11(struct ap_queue *aq,
                        len = t86r->fmt2.offset1 + t86r->fmt2.count1;
                        if (len > reply->bufsize || len > msg->bufsize ||
                            len != reply->len) {
-                               pr_debug("%s len mismatch => EMSGSIZE\n",
-                                        __func__);
+                               pr_debug("len mismatch => EMSGSIZE\n");
                                msg->rc = -EMSGSIZE;
                                goto out;
                        }
@@ -1154,8 +1147,8 @@ static long zcrypt_msgtype6_send_cprb(bool userspace, struct zcrypt_queue *zq,
 
 out:
        if (rc)
-               pr_debug("%s send cprb at dev=%02x.%04x rc=%d\n",
-                        __func__, AP_QID_CARD(zq->queue->qid),
+               pr_debug("send cprb at dev=%02x.%04x rc=%d\n",
+                        AP_QID_CARD(zq->queue->qid),
                         AP_QID_QUEUE(zq->queue->qid), rc);
        return rc;
 }
@@ -1277,8 +1270,8 @@ static long zcrypt_msgtype6_send_ep11_cprb(bool userspace, struct zcrypt_queue *
 
 out:
        if (rc)
-               pr_debug("%s send cprb at dev=%02x.%04x rc=%d\n",
-                        __func__, AP_QID_CARD(zq->queue->qid),
+               pr_debug("send cprb at dev=%02x.%04x rc=%d\n",
+                        AP_QID_CARD(zq->queue->qid),
                         AP_QID_QUEUE(zq->queue->qid), rc);
        return rc;
 }