Use ncr_lists instead of list_sem_st in intefaces

Should result in no functionality change.

This makes the code marginally more effective (reducing the number of
"&lst->key" and "&lst->sessions" operations in the code, and moving them
toward dereferences where they can be combined with member accesses),
and more type-safe (prevents mixing the key and session list in most
places because they the difference is only in the low-level accessor
functions).

Most importantly, this allows replacing list_sem_st without having to
touch most of the functions again.

1 files changed, 14 insertions, 14 deletions

diff --git a/ncr.c b/ncr.c
index 87bd05204a9..5bf8c5e736c 100644
--- a/ncr.c
+++ b/ncr.c
@@ -67,8 +67,8 @@ void* ncr_init_lists(void)
 void ncr_deinit_lists(struct ncr_lists *lst)
 {
 	if(lst) {
-		ncr_key_list_deinit(&lst->key);
-		ncr_sessions_list_deinit(&lst->sessions);
+		ncr_key_list_deinit(lst);
+		ncr_sessions_list_deinit(lst);
 		kfree(lst);
 	}
 }
@@ -127,25 +127,25 @@ ncr_ioctl(struct ncr_lists* lst, struct file *filp,
 
 	switch (cmd) {
 		case NCRIO_KEY_INIT:
-			return ncr_key_init(&lst->key, arg);
+			return ncr_key_init(lst, arg);
 		case NCRIO_KEY_DEINIT:
-			return ncr_key_deinit(&lst->key, arg);
+			return ncr_key_deinit(lst, arg);
 		case NCRIO_KEY_GENERATE:
-			return ncr_key_generate(&lst->key, arg);
+			return ncr_key_generate(lst, arg);
 		case NCRIO_KEY_EXPORT:
-			return ncr_key_export(&lst->key, arg);
+			return ncr_key_export(lst, arg);
 		case NCRIO_KEY_IMPORT:
-			return ncr_key_import(&lst->key, arg);
+			return ncr_key_import(lst, arg);
 		case NCRIO_KEY_GET_INFO:
-			return ncr_key_info(&lst->key, arg);
+			return ncr_key_info(lst, arg);
 		case NCRIO_KEY_WRAP:
-			return ncr_key_wrap(&lst->key, arg);
+			return ncr_key_wrap(lst, arg);
 		case NCRIO_KEY_UNWRAP:
-			return ncr_key_unwrap(&lst->key, arg);
+			return ncr_key_unwrap(lst, arg);
 		case NCRIO_KEY_STORAGE_WRAP:
-			return ncr_key_storage_wrap(&lst->key, arg);
+			return ncr_key_storage_wrap(lst, arg);
 		case NCRIO_KEY_STORAGE_UNWRAP:
-			return ncr_key_storage_unwrap(&lst->key, arg);
+			return ncr_key_storage_unwrap(lst, arg);
 		case NCRIO_SESSION_INIT:
 			return ncr_session_init(lst, arg);
 		case NCRIO_SESSION_UPDATE:
@@ -158,9 +158,9 @@ ncr_ioctl(struct ncr_lists* lst, struct file *filp,
 		case NCRIO_MASTER_KEY_SET:
 			return ncr_master_key_set(arg);
 		case NCRIO_KEY_GENERATE_PAIR:
-			return ncr_key_generate_pair(&lst->key, arg);
+			return ncr_key_generate_pair(lst, arg);
 		case NCRIO_KEY_DERIVE:
-			return ncr_key_derive(&lst->key, arg);
+			return ncr_key_derive(lst, arg);
 		default:
 			return -EINVAL;
 	}