From 2a7aed72981a25f653be09cba5d0b4248e70268c Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 16 Mar 2023 22:47:27 +0000 Subject: [PATCH] ANDROID: dm-default-key: update for blk_crypto_evict_key() returning void blk_crypto_evict_key() now returns void, so update default_key_dtr() accordingly. Bug: 270098322 Change-Id: I6add49a8f792c51f33e7adb189a9e7ed5ff410b0 Signed-off-by: Eric Biggers --- drivers/md/dm-default-key.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/md/dm-default-key.c b/drivers/md/dm-default-key.c index e8e9b72d30c5..eaa83298858c 100644 --- a/drivers/md/dm-default-key.c +++ b/drivers/md/dm-default-key.c @@ -67,13 +67,9 @@ lookup_cipher(const char *cipher_string) static void default_key_dtr(struct dm_target *ti) { struct default_key_c *dkc = ti->private; - int err; if (dkc->dev) { - err = blk_crypto_evict_key(bdev_get_queue(dkc->dev->bdev), - &dkc->key); - if (err && err != -ENOKEY) - DMWARN("Failed to evict crypto key: %d", err); + blk_crypto_evict_key(bdev_get_queue(dkc->dev->bdev), &dkc->key); dm_put_device(ti, dkc->dev); } kfree_sensitive(dkc->cipher_string);