aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/uapi
diff options
context:
space:
mode:
authorHarald Freudenberger <freude@linux.ibm.com>2018-08-17 06:36:01 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-08-20 10:02:11 -0400
commitac2b96f351d7d222c46e524feca03005f3fa8d75 (patch)
tree22ecfddad785944611b1342a68e1fb51f8ac38c2 /arch/s390/include/uapi
parent9b97e9f555f1fe5044dc76d9212078757aa143ce (diff)
s390/zcrypt: code beautify
Code beautify by following most of the checkpatch suggestions: - SPDX license identifier line complains by checkpatch - missing space or newline complains by checkpatch - octal numbers for permssions complains by checkpatch - renaming of static sysfs functions complains by checkpatch - fix of block comment complains by checkpatch - fix printf like calls where function name instead of %s __func__ was used - __packed instead of __attribute__((packed)) - init to zero for static variables removed - use of DEVICE_ATTR_RO and DEVICE_ATTR_RW macros No functional code changes or API changes! Signed-off-by: Harald Freudenberger <freude@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/uapi')
-rw-r--r--arch/s390/include/uapi/asm/zcrypt.h72
1 files changed, 36 insertions, 36 deletions
diff --git a/arch/s390/include/uapi/asm/zcrypt.h b/arch/s390/include/uapi/asm/zcrypt.h
index b62e0614e440..2bb1f3bb98ac 100644
--- a/arch/s390/include/uapi/asm/zcrypt.h
+++ b/arch/s390/include/uapi/asm/zcrypt.h
@@ -32,12 +32,12 @@
32 * - length(n_modulus) = inputdatalength 32 * - length(n_modulus) = inputdatalength
33 */ 33 */
34struct ica_rsa_modexpo { 34struct ica_rsa_modexpo {
35 char __user * inputdata; 35 char __user *inputdata;
36 unsigned int inputdatalength; 36 unsigned int inputdatalength;
37 char __user * outputdata; 37 char __user *outputdata;
38 unsigned int outputdatalength; 38 unsigned int outputdatalength;
39 char __user * b_key; 39 char __user *b_key;
40 char __user * n_modulus; 40 char __user *n_modulus;
41}; 41};
42 42
43/** 43/**
@@ -55,15 +55,15 @@ struct ica_rsa_modexpo {
55 * - length(u_mult_inv) = inputdatalength/2 + 8 55 * - length(u_mult_inv) = inputdatalength/2 + 8
56 */ 56 */
57struct ica_rsa_modexpo_crt { 57struct ica_rsa_modexpo_crt {
58 char __user * inputdata; 58 char __user *inputdata;
59 unsigned int inputdatalength; 59 unsigned int inputdatalength;
60 char __user * outputdata; 60 char __user *outputdata;
61 unsigned int outputdatalength; 61 unsigned int outputdatalength;
62 char __user * bp_key; 62 char __user *bp_key;
63 char __user * bq_key; 63 char __user *bq_key;
64 char __user * np_prime; 64 char __user *np_prime;
65 char __user * nq_prime; 65 char __user *nq_prime;
66 char __user * u_mult_inv; 66 char __user *u_mult_inv;
67}; 67};
68 68
69/** 69/**
@@ -93,18 +93,18 @@ struct CPRBX {
93 unsigned int req_extbl; /* request extension block len */ 93 unsigned int req_extbl; /* request extension block len */
94 unsigned char pad_001[4]; /* reserved */ 94 unsigned char pad_001[4]; /* reserved */
95 unsigned int rpld_extbl; /* replied extension block len */ 95 unsigned int rpld_extbl; /* replied extension block len */
96 unsigned char padx000[16 - sizeof (char *)]; 96 unsigned char padx000[16 - sizeof(char *)];
97 unsigned char * req_parmb; /* request parm block 'address' */ 97 unsigned char *req_parmb; /* request parm block 'address' */
98 unsigned char padx001[16 - sizeof (char *)]; 98 unsigned char padx001[16 - sizeof(char *)];
99 unsigned char * req_datab; /* request data block 'address' */ 99 unsigned char *req_datab; /* request data block 'address' */
100 unsigned char padx002[16 - sizeof (char *)]; 100 unsigned char padx002[16 - sizeof(char *)];
101 unsigned char * rpl_parmb; /* reply parm block 'address' */ 101 unsigned char *rpl_parmb; /* reply parm block 'address' */
102 unsigned char padx003[16 - sizeof (char *)]; 102 unsigned char padx003[16 - sizeof(char *)];
103 unsigned char * rpl_datab; /* reply data block 'address' */ 103 unsigned char *rpl_datab; /* reply data block 'address' */
104 unsigned char padx004[16 - sizeof (char *)]; 104 unsigned char padx004[16 - sizeof(char *)];
105 unsigned char * req_extb; /* request extension block 'addr'*/ 105 unsigned char *req_extb; /* request extension block 'addr'*/
106 unsigned char padx005[16 - sizeof (char *)]; 106 unsigned char padx005[16 - sizeof(char *)];
107 unsigned char * rpl_extb; /* reply extension block 'address'*/ 107 unsigned char *rpl_extb; /* reply extension block 'address'*/
108 unsigned short ccp_rtcode; /* server return code */ 108 unsigned short ccp_rtcode; /* server return code */
109 unsigned short ccp_rscode; /* server reason code */ 109 unsigned short ccp_rscode; /* server reason code */
110 unsigned int mac_data_len; /* Mac Data Length */ 110 unsigned int mac_data_len; /* Mac Data Length */
@@ -127,17 +127,17 @@ struct ica_xcRB {
127 unsigned int user_defined; 127 unsigned int user_defined;
128 unsigned short request_ID; 128 unsigned short request_ID;
129 unsigned int request_control_blk_length; 129 unsigned int request_control_blk_length;
130 unsigned char padding1[16 - sizeof (char *)]; 130 unsigned char padding1[16 - sizeof(char *)];
131 char __user * request_control_blk_addr; 131 char __user *request_control_blk_addr;
132 unsigned int request_data_length; 132 unsigned int request_data_length;
133 char padding2[16 - sizeof (char *)]; 133 char padding2[16 - sizeof(char *)];
134 char __user * request_data_address; 134 char __user *request_data_address;
135 unsigned int reply_control_blk_length; 135 unsigned int reply_control_blk_length;
136 char padding3[16 - sizeof (char *)]; 136 char padding3[16 - sizeof(char *)];
137 char __user * reply_control_blk_addr; 137 char __user *reply_control_blk_addr;
138 unsigned int reply_data_length; 138 unsigned int reply_data_length;
139 char padding4[16 - sizeof (char *)]; 139 char padding4[16 - sizeof(char *)];
140 char __user * reply_data_addr; 140 char __user *reply_data_addr;
141 unsigned short priority_window; 141 unsigned short priority_window;
142 unsigned int status; 142 unsigned int status;
143} __attribute__((packed)); 143} __attribute__((packed));
@@ -233,7 +233,7 @@ struct zcrypt_device_matrix_ext {
233 struct zcrypt_device_status_ext device[MAX_ZDEV_ENTRIES_EXT]; 233 struct zcrypt_device_status_ext device[MAX_ZDEV_ENTRIES_EXT];
234}; 234};
235 235
236#define AUTOSELECT ((unsigned int)0xFFFFFFFF) 236#define AUTOSELECT 0xFFFFFFFF
237 237
238#define ZCRYPT_IOCTL_MAGIC 'z' 238#define ZCRYPT_IOCTL_MAGIC 'z'
239 239