From 72c4254ea9ef7553c6e8182afb71fcf5c2b09e75 Mon Sep 17 00:00:00 2001 From: Prerna Kalla Date: Tue, 19 May 2020 14:10:55 +0530 Subject: [PATCH] crypto: msm: make qcrypto and qcedev independent of DEBUG_FS qcrypto_init() and qcedev_init() should not be dependent on DEBUG_FS API's returning success. Continue device init,when DEBUG_FS is disabled. Change-Id: I32cca791db545f5f2f9ea7871c091b121082dfbc Signed-off-by: Prerna Kalla --- drivers/crypto/msm/qcedev.c | 10 +++------- drivers/crypto/msm/qcrypto.c | 11 ++++------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/msm/qcedev.c b/drivers/crypto/msm/qcedev.c index aeb644f5ca16..74d58d8cc229 100644 --- a/drivers/crypto/msm/qcedev.c +++ b/drivers/crypto/msm/qcedev.c @@ -2299,7 +2299,7 @@ static int _qcedev_debug_init(void) _debug_dent = debugfs_create_dir("qcedev", NULL); if (IS_ERR(_debug_dent)) { - pr_err("qcedev debugfs_create_dir fail, error %ld\n", + pr_debug("qcedev debugfs_create_dir fail, error %ld\n", PTR_ERR(_debug_dent)); return PTR_ERR(_debug_dent); } @@ -2309,7 +2309,7 @@ static int _qcedev_debug_init(void) dent = debugfs_create_file(name, 0644, _debug_dent, &_debug_qcedev, &_debug_stats_ops); if (dent == NULL) { - pr_err("qcedev debugfs_create_file fail, error %ld\n", + pr_debug("qcedev debugfs_create_file fail, error %ld\n", PTR_ERR(dent)); rc = PTR_ERR(dent); goto err; @@ -2322,11 +2322,7 @@ err: static int qcedev_init(void) { - int rc; - - rc = _qcedev_debug_init(); - if (rc) - return rc; + _qcedev_debug_init(); return platform_driver_register(&qcedev_plat_driver); } diff --git a/drivers/crypto/msm/qcrypto.c b/drivers/crypto/msm/qcrypto.c index 0c47d8e58f8e..a948c7bfcf89 100644 --- a/drivers/crypto/msm/qcrypto.c +++ b/drivers/crypto/msm/qcrypto.c @@ -1,7 +1,7 @@ /* * QTI Crypto driver * - * Copyright (c) 2010-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2010-2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -5529,7 +5529,7 @@ static int _qcrypto_debug_init(void) _debug_dent = debugfs_create_dir("qcrypto", NULL); if (IS_ERR(_debug_dent)) { - pr_err("qcrypto debugfs_create_dir fail, error %ld\n", + pr_debug("qcrypto debugfs_create_dir fail, error %ld\n", PTR_ERR(_debug_dent)); return PTR_ERR(_debug_dent); } @@ -5539,7 +5539,7 @@ static int _qcrypto_debug_init(void) dent = debugfs_create_file(name, 0644, _debug_dent, &_debug_qcrypto, &_debug_stats_ops); if (dent == NULL) { - pr_err("qcrypto debugfs_create_file fail, error %ld\n", + pr_debug("qcrypto debugfs_create_file fail, error %ld\n", PTR_ERR(dent)); rc = PTR_ERR(dent); goto err; @@ -5552,12 +5552,9 @@ err: static int __init _qcrypto_init(void) { - int rc; struct crypto_priv *pcp = &qcrypto_dev; - rc = _qcrypto_debug_init(); - if (rc) - return rc; + _qcrypto_debug_init(); INIT_LIST_HEAD(&pcp->alg_list); INIT_LIST_HEAD(&pcp->engine_list); init_llist_head(&pcp->ordered_resp_list);