Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e13fc01 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 16b8d19f 80acd2bc

drivers/crypto/msm/qcedev.c

+3 −7
Original line number Diff line number Diff line
@@ -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 @@ static int _qcedev_debug_init(void) 


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);

}

drivers/crypto/msm/qcrypto.c

+3 −6
Original line number Diff line number Diff line
@@ -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 @@ static int _qcrypto_debug_init(void) 


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);