Merge "crypto: msm: make qcrypto and qcedev independent of DEBUG_FS"

This commit is contained in:
qctecmdr 2020-05-21 00:50:56 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5e13fc010c
2 changed files with 6 additions and 13 deletions

View file

@ -2286,7 +2286,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);
}
@ -2296,7 +2296,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;
@ -2309,11 +2309,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);
}

View file

@ -5512,7 +5512,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);
}
@ -5522,7 +5522,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;
@ -5535,12 +5535,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);