From b4f695428f49755fd00f2e8ebcd53cecb7270d15 Mon Sep 17 00:00:00 2001 From: Andrey Markovytch Date: Sun, 17 Apr 2016 14:54:11 +0300 Subject: crypto: ice: general driver clean-up * Removed spinlock as it was not locking against anything * Removed conversion of interrupt status to error number as it is not used by API client, and in case several bits are set only 1 error is ever handled and the rest get lost. Instead pass to the client the complete status. * Removed redundant includes, variables * vops structure is returned after performing a lookup in the DTS. There's no need for that as we already know the structure to return. * Other minor corrections Change-Id: I6d2549ce04c9e4b19fdd8fe3dfee03d83bfd9d77 Signed-off-by: Gilad Broner Signed-off-by: Andrey Markovytch --- include/crypto/ice.h | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'include') diff --git a/include/crypto/ice.h b/include/crypto/ice.h index 158a6994d361..b835a7f5f057 100644 --- a/include/crypto/ice.h +++ b/include/crypto/ice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -49,33 +49,7 @@ struct ice_data_setting { bool encr_bypass; }; -enum ice_error_code { - ICE_ERROR_UNEXPECTED_ICE_DEVICE, - ICE_ERROR_PARTITIAL_KEY_LOAD, - ICE_ERROR_IMPROPER_INITIALIZATION, - ICE_ERROR_INVALID_ARGUMENTS, - ICE_ERROR_HW_DISABLE_FUSE_BLOWN, - ICE_ERROR_ICE_KEY_RESTORE_FAILED, - ICE_ERROR_ICE_TZ_INIT_FAILED, - ICE_ERROR_STREAM1_PREMATURE_LBA_CHANGE, - ICE_ERROR_STREAM2_PREMATURE_LBA_CHANGE, - ICE_ERROR_STREAM1_UNEXPECTED_LBA, - ICE_ERROR_STREAM2_UNEXPECTED_LBA, - ICE_ERROR_STREAM1_NOT_EXPECTED_DUN, - ICE_ERROR_STREAM2_NOT_EXPECTED_DUN, - ICE_ERROR_STREAM1_NOT_EXPECTED_DUS, - ICE_ERROR_STREAM2_NOT_EXPECTED_DUS, - ICE_ERROR_STREAM1_NOT_EXPECTED_DBO, - ICE_ERROR_STREAM2_NOT_EXPECTED_DBO, - ICE_ERROR_STREAM1_NOT_EXPECTED_ENC_SEL, - ICE_ERROR_STREAM2_NOT_EXPECTED_ENC_SEL, - ICE_ERROR_STREAM1_NOT_EXPECTED_CONF_IDX, - ICE_ERROR_STREAM2_NOT_EXPECTED_CONF_IDX, - ICE_ERROR_STREAM1_NOT_EXPECTED_NEW_TRNS, - ICE_ERROR_STREAM2_NOT_EXPECTED_NEW_TRNS -}; - -typedef void (*ice_error_cb)(void *, enum ice_error_code); +typedef void (*ice_error_cb)(void *, u32 error); struct qcom_ice_variant_ops *qcom_ice_get_variant_ops(struct device_node *node); struct platform_device *qcom_ice_get_pdevice(struct device_node *node); -- cgit v1.2.3