From 745eb0ccb612786663dd3967c39b6d9a1c3f6963 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 23 Sep 2010 11:26:38 +0000
Subject: [PATCH] Simplify code a bit.

MFC after:	1 week
---
 sys/crypto/aesni/aesni.c      |  4 +---
 sys/crypto/aesni/aesni_wrap.c | 11 ++++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sys/crypto/aesni/aesni.c b/sys/crypto/aesni/aesni.c
index 93ee042cd05c..fd13e3aa289a 100644
--- a/sys/crypto/aesni/aesni.c
+++ b/sys/crypto/aesni/aesni.c
@@ -69,14 +69,12 @@ aesni_identify(driver_t *drv, device_t parent)
 static int
 aesni_probe(device_t dev)
 {
-	char capp[32];
 
 	if ((cpu_feature2 & CPUID2_AESNI) == 0) {
 		device_printf(dev, "No AESNI support.\n");
 		return (EINVAL);
 	}
-	strlcpy(capp, "AES-CBC", sizeof(capp));
-	device_set_desc_copy(dev, capp);
+	device_set_desc_copy(dev, "AES-CBC");
 	return (0);
 }
 
diff --git a/sys/crypto/aesni/aesni_wrap.c b/sys/crypto/aesni/aesni_wrap.c
index fd08222e5d1c..496b59bb3e27 100644
--- a/sys/crypto/aesni/aesni_wrap.c
+++ b/sys/crypto/aesni/aesni_wrap.c
@@ -147,15 +147,13 @@ aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd,
 	int error, allocated;
 
 	buf = aesni_cipher_alloc(enccrd, crp, &allocated);
-	if (buf == NULL) {
-		error = ENOMEM;
-		goto out;
-	}
+	if (buf == NULL)
+		return (ENOMEM);
 
 	td = curthread;
 	error = fpu_kern_enter(td, &ses->fpu_ctx, FPU_KERN_NORMAL);
 	if (error != 0)
-		goto out1;
+		goto out;
 
 	if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0) {
 		if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0)
@@ -184,11 +182,10 @@ aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd,
 		crypto_copydata(crp->crp_flags, crp->crp_buf,
 		    enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN,
 		    AES_BLOCK_LEN, ses->iv);
- out1:
+ out:
 	if (allocated) {
 		bzero(buf, enccrd->crd_len);
 		free(buf, M_AESNI);
 	}
- out:
 	return (error);
 }