staging: ccree: remove func name from log messages

The SSI_LOG macros already add __func__ to log messages, so remove
log message that add them a second time in the log message itself.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c
index ad53126d6705ac283a191335750472ab42219b98..f5ca0e35c5d386b069bfc67edd994a74041bc11b 100644 (file)
--- a/drivers/staging/ccree/ssi_aead.c
+++ b/drivers/staging/ccree/ssi_aead.c
@@ -2269,7 +2269,7 @@ static int ssi_gcm_setauthsize(struct crypto_aead *authenc,
 static int ssi_rfc4106_gcm_setauthsize(struct crypto_aead *authenc,
                                       unsigned int authsize)
 {
-       SSI_LOG_DEBUG("ssi_rfc4106_gcm_setauthsize()  authsize %d\n", authsize);
+       SSI_LOG_DEBUG("authsize %d\n", authsize);
 
        switch (authsize) {
        case 8:
@@ -2286,7 +2286,7 @@ static int ssi_rfc4106_gcm_setauthsize(struct crypto_aead *authenc,
 static int ssi_rfc4543_gcm_setauthsize(struct crypto_aead *authenc,
                                       unsigned int authsize)
 {
-       SSI_LOG_DEBUG("ssi_rfc4543_gcm_setauthsize()  authsize %d\n", authsize);
+       SSI_LOG_DEBUG("authsize %d\n", authsize);
 
        if (authsize != 16)
                return -EINVAL;

diff --git a/drivers/staging/ccree/ssi_cipher.c b/drivers/staging/ccree/ssi_cipher.c
index aec7c1480336fd9832b63f92c393e08616d5908f..6219a92184aa72bb2fe116c6ad4ed329ff402ee9 100644 (file)
--- a/drivers/staging/ccree/ssi_cipher.c
+++ b/drivers/staging/ccree/ssi_cipher.c
@@ -305,7 +305,7 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                      ctx_p, crypto_tfm_alg_name(tfm), keylen);
        dump_byte_array("key", (u8 *)key, keylen);
 
-       SSI_LOG_DEBUG("ssi_blkcipher_setkey: after FIPS check");
+       SSI_LOG_DEBUG("after FIPS check");
 
        /* STAT_PHASE_0: Init and sanity checks */
 
@@ -351,7 +351,7 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                }
 
                ctx_p->keylen = keylen;
-               SSI_LOG_DEBUG("ssi_blkcipher_setkey: ssi_is_hw_key ret 0");
+               SSI_LOG_DEBUG("ssi_is_hw_key ret 0");
 
                return 0;
        }
@@ -361,19 +361,19 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                if (unlikely(!des_ekey(tmp, key)) &&
                    (crypto_tfm_get_flags(tfm) & CRYPTO_TFM_REQ_WEAK_KEY)) {
                        tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
-                       SSI_LOG_DEBUG("ssi_blkcipher_setkey:  weak DES key");
+                       SSI_LOG_DEBUG("weak DES key");
                        return -EINVAL;
                }
        }
        if ((ctx_p->cipher_mode == DRV_CIPHER_XTS) &&
            xts_check_key(tfm, key, keylen) != 0) {
-               SSI_LOG_DEBUG("ssi_blkcipher_setkey: weak XTS key");
+               SSI_LOG_DEBUG("weak XTS key");
                return -EINVAL;
        }
        if ((ctx_p->flow_mode == S_DIN_to_DES) &&
            (keylen == DES3_EDE_KEY_SIZE) &&
            ssi_verify_3des_keys(key, keylen) != 0) {
-               SSI_LOG_DEBUG("ssi_blkcipher_setkey: weak 3DES key");
+               SSI_LOG_DEBUG("weak 3DES key");
                return -EINVAL;
        }
 
@@ -388,7 +388,7 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                if (ctx_p->key_round_number < CC_MULTI2_MIN_NUM_ROUNDS ||
                    ctx_p->key_round_number > CC_MULTI2_MAX_NUM_ROUNDS) {
                        crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
-                       SSI_LOG_DEBUG("ssi_blkcipher_setkey: SSI_CC_HAS_MULTI2 einval");
+                       SSI_LOG_DEBUG("SSI_CC_HAS_MULTI2 einval");
                        return -EINVAL;
 #endif /*SSI_CC_HAS_MULTI2*/
        } else {
@@ -415,7 +415,7 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                                   max_key_buf_size, DMA_TO_DEVICE);
        ctx_p->keylen = keylen;
 
-        SSI_LOG_DEBUG("ssi_blkcipher_setkey: return safely");
+        SSI_LOG_DEBUG("return safely");
        return 0;
 }
 

diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c
index e0faca0a30a6c94f168cb25b3c41850ccce5a42a..a4ab9ef4baf73723b82b3040571267892a025fae 100644 (file)
--- a/drivers/staging/ccree/ssi_driver.c
+++ b/drivers/staging/ccree/ssi_driver.c
@@ -81,7 +81,7 @@ void dump_byte_array(const char *name, const u8 *the_array, unsigned long size)
        char line_buf[80];
 
        if (!the_array) {
-               SSI_LOG_ERR("cannot %s - NULL pointer\n", __func__);
+               SSI_LOG_ERR("cannot dump array - NULL pointer\n");
                return;
        }
 

diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/ssi_hash.c
index a5b3e9bebd9577ef9705ff3391ec2c03db397ace..7fd3c3ce42a52ee26c81172738e5beecfe0d25dd 100644 (file)
--- a/drivers/staging/ccree/ssi_hash.c
+++ b/drivers/staging/ccree/ssi_hash.c
@@ -977,7 +977,7 @@ static int ssi_hash_setkey(void *hash,
        struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
        ssi_sram_addr_t larval_addr;
 
-        SSI_LOG_DEBUG("ssi_hash_setkey: start keylen: %d", keylen);
+        SSI_LOG_DEBUG("start keylen: %d", keylen);
 
        ctx = crypto_ahash_ctx(((struct crypto_ahash *)hash));
        blocksize = crypto_tfm_alg_blocksize(&((struct crypto_ahash *)hash)->base);

diff --git a/drivers/staging/ccree/ssi_pm.c b/drivers/staging/ccree/ssi_pm.c
index 52a8ed5791774f3cbc4482e4e2caeb8581c54685..31325e6cd4b4ace3c7d153158a30b0de7a8017be 100644 (file)
--- a/drivers/staging/ccree/ssi_pm.c
+++ b/drivers/staging/ccree/ssi_pm.c
@@ -40,7 +40,7 @@ int ssi_power_mgr_runtime_suspend(struct device *dev)
                (struct ssi_drvdata *)dev_get_drvdata(dev);
        int rc;
 
-       SSI_LOG_DEBUG("ssi_power_mgr_runtime_suspend: set HOST_POWER_DOWN_EN\n");
+       SSI_LOG_DEBUG("set HOST_POWER_DOWN_EN\n");
        WRITE_REGISTER(drvdata->cc_base + CC_REG_OFFSET(HOST_RGF, HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE);
        rc = ssi_request_mgr_runtime_suspend_queue(drvdata);
        if (rc != 0) {
@@ -58,7 +58,7 @@ int ssi_power_mgr_runtime_resume(struct device *dev)
        struct ssi_drvdata *drvdata =
                (struct ssi_drvdata *)dev_get_drvdata(dev);
 
-       SSI_LOG_DEBUG("ssi_power_mgr_runtime_resume , unset HOST_POWER_DOWN_EN\n");
+       SSI_LOG_DEBUG("unset HOST_POWER_DOWN_EN\n");
        WRITE_REGISTER(drvdata->cc_base + CC_REG_OFFSET(HOST_RGF, HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE);
 
        rc = cc_clk_on(drvdata);