diff options
Diffstat (limited to 'drivers/staging/crypto')
-rw-r--r-- | drivers/staging/crypto/cryptodev/cryptodev_int.h | 2 | ||||
-rw-r--r-- | drivers/staging/crypto/cryptodev/ioctl.c | 32 | ||||
-rw-r--r-- | drivers/staging/crypto/cryptodev/main.c | 4 |
3 files changed, 19 insertions, 19 deletions
diff --git a/drivers/staging/crypto/cryptodev/cryptodev_int.h b/drivers/staging/crypto/cryptodev/cryptodev_int.h index c01e61965dbe..675b61821f2a 100644 --- a/drivers/staging/crypto/cryptodev/cryptodev_int.h +++ b/drivers/staging/crypto/cryptodev/cryptodev_int.h @@ -57,7 +57,7 @@ struct compat_session_op { }; /* input of CIOCCRYPT */ - struct compat_crypt_op { +struct compat_crypt_op { uint32_t ses; /* session identifier */ uint16_t op; /* COP_ENCRYPT or COP_DECRYPT */ uint16_t flags; /* see COP_FLAG_* */ diff --git a/drivers/staging/crypto/cryptodev/ioctl.c b/drivers/staging/crypto/cryptodev/ioctl.c index 8710913eaaad..aa287acc0fd6 100644 --- a/drivers/staging/crypto/cryptodev/ioctl.c +++ b/drivers/staging/crypto/cryptodev/ioctl.c @@ -957,7 +957,7 @@ static int compat_kcop_from_user(struct kernel_crypt_op *kcop, } static int compat_kcop_to_user(struct kernel_crypt_op *kcop, - struct fcrypt *fcr, void __user *arg) + struct fcrypt *fcr, void __user *arg) { int ret; struct compat_crypt_op compat_cop; @@ -1102,23 +1102,23 @@ cryptodev_deregister(void) /* ====== Module init/exit ====== */ static struct ctl_table verbosity_ctl_dir[] = { - { - .procname = "cryptodev_verbosity", - .data = &cryptodev_verbosity, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - {0, }, + { + .procname = "cryptodev_verbosity", + .data = &cryptodev_verbosity, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + {0, }, }; static struct ctl_table verbosity_ctl_root[] = { - { - .procname = "ioctl", - .mode = 0555, - .child = verbosity_ctl_dir, - }, - {0, }, + { + .procname = "ioctl", + .mode = 0555, + .child = verbosity_ctl_dir, + }, + {0, }, }; static struct ctl_table_header *verbosity_sysctl_header; static int __init init_cryptodev(void) @@ -1150,7 +1150,7 @@ static void __exit exit_cryptodev(void) destroy_workqueue(cryptodev_wq); if (verbosity_sysctl_header) - unregister_sysctl_table(verbosity_sysctl_header); + unregister_sysctl_table(verbosity_sysctl_header); cryptodev_deregister(); printk(KERN_INFO PFX "driver unloaded.\n"); diff --git a/drivers/staging/crypto/cryptodev/main.c b/drivers/staging/crypto/cryptodev/main.c index e25776e8db64..4617e723768e 100644 --- a/drivers/staging/crypto/cryptodev/main.c +++ b/drivers/staging/crypto/cryptodev/main.c @@ -116,7 +116,7 @@ __crypto_run_std(struct csession *ses_ptr, struct crypt_op *cop) if (unlikely(!data)) { dprintk(1, KERN_ERR, "Error getting free page.\n"); return -ENOMEM; - } + } bufsize = PAGE_SIZE < nbytes ? PAGE_SIZE : nbytes; @@ -139,7 +139,7 @@ __crypto_run_std(struct csession *ses_ptr, struct crypt_op *cop) if (unlikely(ret)) { dprintk(1, KERN_ERR, "hash_n_crypt failed.\n"); break; - } + } if (ses_ptr->cdata.init != 0) { if (unlikely(copy_to_user(dst, data, current_len))) { |