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

Commit 88d58ef8 authored Jun 06, 2017 by Corentin LABBE Committed by Herbert Xu Jun 19, 2017

crypto: engine - replace pr_xxx by dev_xxx



By adding a struct device *dev to struct engine, we could store the
device used at register time and so use all dev_xxx functions instead of
pr_xxx.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent cf3f9609

crypto/crypto_engine.c

+13 −10

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ static void crypto_pump_requests(struct crypto_engine *engine,

		if (engine->unprepare_crypt_hardware &&
		engine->unprepare_crypt_hardware(engine))
		pr_err("failed to unprepare crypt hardware\n");
		dev_err(engine->dev, "failed to unprepare crypt hardware\n");

		spin_lock_irqsave(&engine->queue_lock, flags);
		engine->idling = false;
		@@ -99,7 +99,7 @@ static void crypto_pump_requests(struct crypto_engine *engine,
		if (!was_busy && engine->prepare_crypt_hardware) {
		ret = engine->prepare_crypt_hardware(engine);
		if (ret) {
		pr_err("failed to prepare crypt hardware\n");
		dev_err(engine->dev, "failed to prepare crypt hardware\n");
		goto req_err;
		}
		}
		@@ -110,14 +110,15 @@ static void crypto_pump_requests(struct crypto_engine *engine,
		if (engine->prepare_hash_request) {
		ret = engine->prepare_hash_request(engine, hreq);
		if (ret) {
		pr_err("failed to prepare request: %d\n", ret);
		dev_err(engine->dev, "failed to prepare request: %d\n",
		ret);
		goto req_err;
		}
		engine->cur_req_prepared = true;
		}
		ret = engine->hash_one_request(engine, hreq);
		if (ret) {
		pr_err("failed to hash one request from queue\n");
		dev_err(engine->dev, "failed to hash one request from queue\n");
		goto req_err;
		}
		return;
		@@ -126,19 +127,20 @@ static void crypto_pump_requests(struct crypto_engine *engine,
		if (engine->prepare_cipher_request) {
		ret = engine->prepare_cipher_request(engine, breq);
		if (ret) {
		pr_err("failed to prepare request: %d\n", ret);
		dev_err(engine->dev, "failed to prepare request: %d\n",
		ret);
		goto req_err;
		}
		engine->cur_req_prepared = true;
		}
		ret = engine->cipher_one_request(engine, breq);
		if (ret) {
		pr_err("failed to cipher one request from queue\n");
		dev_err(engine->dev, "failed to cipher one request from queue\n");
		goto req_err;
		}
		return;
		default:
		pr_err("failed to prepare request of unknown type\n");
		dev_err(engine->dev, "failed to prepare request of unknown type\n");
		return;
		}

		@@ -275,7 +277,7 @@ void crypto_finalize_cipher_request(struct crypto_engine *engine,
		engine->unprepare_cipher_request) {
		ret = engine->unprepare_cipher_request(engine, req);
		if (ret)
		pr_err("failed to unprepare request\n");
		dev_err(engine->dev, "failed to unprepare request\n");
		}
		spin_lock_irqsave(&engine->queue_lock, flags);
		engine->cur_req = NULL;
		@@ -312,7 +314,7 @@ void crypto_finalize_hash_request(struct crypto_engine *engine,
		engine->unprepare_hash_request) {
		ret = engine->unprepare_hash_request(engine, req);
		if (ret)
		pr_err("failed to unprepare request\n");
		dev_err(engine->dev, "failed to unprepare request\n");
		}
		spin_lock_irqsave(&engine->queue_lock, flags);
		engine->cur_req = NULL;
		@@ -384,7 +386,7 @@ int crypto_engine_stop(struct crypto_engine *engine)
		spin_unlock_irqrestore(&engine->queue_lock, flags);

		if (ret)
		pr_warn("could not stop engine\n");
		dev_warn(engine->dev, "could not stop engine\n");

		return ret;
		}
		@@ -411,6 +413,7 @@ struct crypto_engine crypto_engine_alloc_init(struct device dev, bool rt)
		if (!engine)
		return NULL;

		engine->dev = dev;
		engine->rt = rt;
		engine->running = false;
		engine->busy = false;

include/crypto/engine.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ struct crypto_engine {
		struct list_head list;
		spinlock_t queue_lock;
		struct crypto_queue queue;
		struct device *dev;

		bool rt;