Commit 88d58ef8 authored by Corentin LABBE's avatar Corentin LABBE Committed by Herbert Xu

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: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cf3f9609
...@@ -70,7 +70,7 @@ static void crypto_pump_requests(struct crypto_engine *engine, ...@@ -70,7 +70,7 @@ static void crypto_pump_requests(struct crypto_engine *engine,
if (engine->unprepare_crypt_hardware && if (engine->unprepare_crypt_hardware &&
engine->unprepare_crypt_hardware(engine)) 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); spin_lock_irqsave(&engine->queue_lock, flags);
engine->idling = false; engine->idling = false;
...@@ -99,7 +99,7 @@ static void crypto_pump_requests(struct crypto_engine *engine, ...@@ -99,7 +99,7 @@ static void crypto_pump_requests(struct crypto_engine *engine,
if (!was_busy && engine->prepare_crypt_hardware) { if (!was_busy && engine->prepare_crypt_hardware) {
ret = engine->prepare_crypt_hardware(engine); ret = engine->prepare_crypt_hardware(engine);
if (ret) { if (ret) {
pr_err("failed to prepare crypt hardware\n"); dev_err(engine->dev, "failed to prepare crypt hardware\n");
goto req_err; goto req_err;
} }
} }
...@@ -110,14 +110,15 @@ static void crypto_pump_requests(struct crypto_engine *engine, ...@@ -110,14 +110,15 @@ static void crypto_pump_requests(struct crypto_engine *engine,
if (engine->prepare_hash_request) { if (engine->prepare_hash_request) {
ret = engine->prepare_hash_request(engine, hreq); ret = engine->prepare_hash_request(engine, hreq);
if (ret) { 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; goto req_err;
} }
engine->cur_req_prepared = true; engine->cur_req_prepared = true;
} }
ret = engine->hash_one_request(engine, hreq); ret = engine->hash_one_request(engine, hreq);
if (ret) { 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; goto req_err;
} }
return; return;
...@@ -126,19 +127,20 @@ static void crypto_pump_requests(struct crypto_engine *engine, ...@@ -126,19 +127,20 @@ static void crypto_pump_requests(struct crypto_engine *engine,
if (engine->prepare_cipher_request) { if (engine->prepare_cipher_request) {
ret = engine->prepare_cipher_request(engine, breq); ret = engine->prepare_cipher_request(engine, breq);
if (ret) { 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; goto req_err;
} }
engine->cur_req_prepared = true; engine->cur_req_prepared = true;
} }
ret = engine->cipher_one_request(engine, breq); ret = engine->cipher_one_request(engine, breq);
if (ret) { 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; goto req_err;
} }
return; return;
default: default:
pr_err("failed to prepare request of unknown type\n"); dev_err(engine->dev, "failed to prepare request of unknown type\n");
return; return;
} }
...@@ -275,7 +277,7 @@ void crypto_finalize_cipher_request(struct crypto_engine *engine, ...@@ -275,7 +277,7 @@ void crypto_finalize_cipher_request(struct crypto_engine *engine,
engine->unprepare_cipher_request) { engine->unprepare_cipher_request) {
ret = engine->unprepare_cipher_request(engine, req); ret = engine->unprepare_cipher_request(engine, req);
if (ret) 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); spin_lock_irqsave(&engine->queue_lock, flags);
engine->cur_req = NULL; engine->cur_req = NULL;
...@@ -312,7 +314,7 @@ void crypto_finalize_hash_request(struct crypto_engine *engine, ...@@ -312,7 +314,7 @@ void crypto_finalize_hash_request(struct crypto_engine *engine,
engine->unprepare_hash_request) { engine->unprepare_hash_request) {
ret = engine->unprepare_hash_request(engine, req); ret = engine->unprepare_hash_request(engine, req);
if (ret) 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); spin_lock_irqsave(&engine->queue_lock, flags);
engine->cur_req = NULL; engine->cur_req = NULL;
...@@ -384,7 +386,7 @@ int crypto_engine_stop(struct crypto_engine *engine) ...@@ -384,7 +386,7 @@ int crypto_engine_stop(struct crypto_engine *engine)
spin_unlock_irqrestore(&engine->queue_lock, flags); spin_unlock_irqrestore(&engine->queue_lock, flags);
if (ret) if (ret)
pr_warn("could not stop engine\n"); dev_warn(engine->dev, "could not stop engine\n");
return ret; return ret;
} }
...@@ -411,6 +413,7 @@ struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt) ...@@ -411,6 +413,7 @@ struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt)
if (!engine) if (!engine)
return NULL; return NULL;
engine->dev = dev;
engine->rt = rt; engine->rt = rt;
engine->running = false; engine->running = false;
engine->busy = false; engine->busy = false;
......
...@@ -58,6 +58,7 @@ struct crypto_engine { ...@@ -58,6 +58,7 @@ struct crypto_engine {
struct list_head list; struct list_head list;
spinlock_t queue_lock; spinlock_t queue_lock;
struct crypto_queue queue; struct crypto_queue queue;
struct device *dev;
bool rt; bool rt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment