[02/26] staging: ccree: fold hash defs into queue defs

Message ID	1514808421-21993-3-git-send-email-gilad@benyossef.com
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Gilad Ben-Yossef <gilad@benyossef.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Ofir Drang <ofir.drang@arm.com>, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org Subject: [PATCH 02/26] staging: ccree: fold hash defs into queue defs Date: Mon, 1 Jan 2018 12:06:29 +0000 Message-Id: <1514808421-21993-3-git-send-email-gilad@benyossef.com> In-Reply-To: <1514808421-21993-1-git-send-email-gilad@benyossef.com> References: <1514808421-21993-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [02/26] staging: ccree: fold hash defs into queue defs [04/26] staging: ccree: remove GFP_DMA flag from mem allocs [05/26] staging: ccree: pick alloc mem flags based on req flags [06/26] staging: ccree: copy larval digest from RAM [07/26] staging: ccree: tag debugfs init/exit func properly [08/26] staging: ccree: remove unused leftover field [09/26] staging: ccree: breakup send_request [11/26] stating: ccree: revert "staging: ccree: fix leak of import() after init()" [13/26] staging: ccree: check DMA pool buf !NULL before free [14/26] staging: ccree: handle end of sg list gracefully [15/26] staging: ccree: use Makefile to include PM code [16/26] staging: ccree: remove unused field [17/26] staging: ccree: use array for double buffer [19/26] staging: ccree: do not map bufs in ahash_init [20/26] staging: ccree: fix indentation of func params [21/26] staging: ccree: fold common code into service func [22/26] staging: ccree: put pointer next to var name [23/26] stating: ccree: fix allocation of void sized buf [25/26] staging: ccree: remove unneeded includes [26/26] staging: ccree: update TODO

Message ID

1514808421-21993-3-git-send-email-gilad@benyossef.com

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Gilad Ben-Yossef <gilad@benyossef.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ofir Drang <ofir.drang@arm.com>, linux-kernel@vger.kernel.org,
	linux-crypto@vger.kernel.org,
	driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org
Subject: [PATCH 02/26] staging: ccree: fold hash defs into queue defs
Date: Mon,  1 Jan 2018 12:06:29 +0000
Message-Id: <1514808421-21993-3-git-send-email-gilad@benyossef.com>
In-Reply-To: <1514808421-21993-1-git-send-email-gilad@benyossef.com>
References: <1514808421-21993-1-git-send-email-gilad@benyossef.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Gilad Ben-Yossef Jan. 1, 2018, 12:06 p.m. UTC

Fold the two remaining enum in hash defs into the queue defs
that are using them and delete the hash defs include file.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>

---
 drivers/staging/ccree/cc_hw_queue_defs.h | 13 +++++++++++++
 drivers/staging/ccree/hash_defs.h        | 23 -----------------------
 drivers/staging/ccree/ssi_driver.h       |  1 -
 3 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 drivers/staging/ccree/hash_defs.h

-- 
2.7.4

diff --git a/drivers/staging/ccree/cc_hw_queue_defs.h b/drivers/staging/ccree/cc_hw_queue_defs.h
index d691141..da5aabc 100644
--- a/drivers/staging/ccree/cc_hw_queue_defs.h
+++ b/drivers/staging/ccree/cc_hw_queue_defs.h
@@ -186,6 +186,19 @@  enum cc_hw_des_key_size {
 	END_OF_DES_KEYS = S32_MAX,
 };
 
+enum cc_hash_conf_pad {
+	HASH_PADDING_DISABLED = 0,
+	HASH_PADDING_ENABLED = 1,
+	HASH_DIGEST_RESULT_LITTLE_ENDIAN = 2,
+	HASH_CONFIG1_PADDING_RESERVE32 = S32_MAX,
+};
+
+enum cc_hash_cipher_pad {
+	DO_NOT_PAD = 0,
+	DO_PAD = 1,
+	HASH_CIPHER_DO_PADDING_RESERVE32 = S32_MAX,
+};
+
 /*****************************/
 /* Descriptor packing macros */
 /*****************************/
diff --git a/drivers/staging/ccree/hash_defs.h b/drivers/staging/ccree/hash_defs.h
deleted file mode 100644
index d527e06..0000000
--- a/drivers/staging/ccree/hash_defs.h
+++ /dev/null
@@ -1,23 +0,0 @@ 
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2012-2017 ARM Limited or its affiliates.
-
-#ifndef _HASH_DEFS_H_
-#define _HASH_DEFS_H_
-
-#include "cc_crypto_ctx.h"
-
-enum cc_hash_conf_pad {
-	HASH_PADDING_DISABLED = 0,
-	HASH_PADDING_ENABLED = 1,
-	HASH_DIGEST_RESULT_LITTLE_ENDIAN = 2,
-	HASH_CONFIG1_PADDING_RESERVE32 = S32_MAX,
-};
-
-enum cc_hash_cipher_pad {
-	DO_NOT_PAD = 0,
-	DO_PAD = 1,
-	HASH_CIPHER_DO_PADDING_RESERVE32 = S32_MAX,
-};
-
-#endif /*_HASH_DEFS_H_*/
-
diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/ssi_driver.h
index e8d70c8..bf3aec8 100644
--- a/drivers/staging/ccree/ssi_driver.h
+++ b/drivers/staging/ccree/ssi_driver.h
@@ -30,7 +30,6 @@ 
 #include "dx_reg_common.h"
 #define CC_SUPPORT_SHA CC_DEV_SHA_MAX
 #include "cc_crypto_ctx.h"
-#include "hash_defs.h"
 #include "cc_hw_queue_defs.h"
 #include "ssi_sram_mgr.h"

[02/26] staging: ccree: fold hash defs into queue defs

Commit Message

Patch