Each ioctl command is directly and uniquely associated with a handler,
i.e. the command is implied by the function itself.
Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
---
arch/x86/kernel/cpu/sgx/driver/ioctl.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/driver/ioctl.c b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
index cc057d487499..a0742d18aa36 100644
--- a/arch/x86/kernel/cpu/sgx/driver/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
@@ -383,7 +383,6 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)
/**
* sgx_ioc_enclave_create - handler for %SGX_IOC_ENCLAVE_CREATE
* @filep: open file to /dev/sgx
- * @cmd: the command value
* @arg: pointer to an &sgx_enclave_create instance
*
* Allocate kernel data structures for a new enclave and execute ECREATE after
@@ -397,8 +396,7 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)
* 0 on success,
* -errno otherwise
*/
-static long sgx_ioc_enclave_create(struct file *filep, unsigned int cmd,
- unsigned long arg)
+static long sgx_ioc_enclave_create(struct file *filep, unsigned long arg)
{
struct sgx_enclave_create *createp = (struct sgx_enclave_create *)arg;
struct sgx_encl *encl = filep->private_data;
@@ -579,7 +577,6 @@ static int sgx_encl_add_page(struct sgx_encl *encl, unsigned long addr,
* sgx_ioc_enclave_add_page - handler for %SGX_IOC_ENCLAVE_ADD_PAGE
*
* @filep: open file to /dev/sgx
- * @cmd: the command value
* @arg: pointer to an &sgx_enclave_add_page instance
*
* Add a page to an uninitialized enclave (EADD), and optionally extend the
@@ -593,8 +590,7 @@ static int sgx_encl_add_page(struct sgx_encl *encl, unsigned long addr,
* 0 on success,
* -errno otherwise
*/
-static long sgx_ioc_enclave_add_page(struct file *filep, unsigned int cmd,
- unsigned long arg)
+static long sgx_ioc_enclave_add_page(struct file *filep, unsigned long arg)
{
struct sgx_enclave_add_page *addp = (void *)arg;
struct sgx_encl *encl = filep->private_data;
@@ -721,7 +717,6 @@ static int sgx_encl_init(struct sgx_encl *encl, struct sgx_sigstruct *sigstruct,
* sgx_ioc_enclave_init - handler for %SGX_IOC_ENCLAVE_INIT
*
* @filep: open file to /dev/sgx
- * @cmd: the command value
* @arg: pointer to an &sgx_enclave_init instance
*
* Flush any outstanding enqueued EADD operations and perform EINIT. The
@@ -733,8 +728,7 @@ static int sgx_encl_init(struct sgx_encl *encl, struct sgx_sigstruct *sigstruct,
* SGX error code on EINIT failure,
* -errno otherwise
*/
-static long sgx_ioc_enclave_init(struct file *filep, unsigned int cmd,
- unsigned long arg)
+static long sgx_ioc_enclave_init(struct file *filep, unsigned long arg)
{
struct sgx_enclave_init *initp = (struct sgx_enclave_init *)arg;
struct sgx_encl *encl = filep->private_data;
@@ -770,7 +764,6 @@ static long sgx_ioc_enclave_init(struct file *filep, unsigned int cmd,
/**
* sgx_ioc_enclave_set_attribute - handler for %SGX_IOC_ENCLAVE_SET_ATTRIBUTE
* @filep: open file to /dev/sgx
- * @cmd: the command value
* @arg: pointer to a struct sgx_enclave_set_attribute instance
*
* Mark the enclave as being allowed to access a restricted attribute bit.
@@ -786,8 +779,7 @@ static long sgx_ioc_enclave_init(struct file *filep, unsigned int cmd,
*
* Return: 0 on success, -errno otherwise
*/
-static long sgx_ioc_enclave_set_attribute(struct file *filep, unsigned int cmd,
- unsigned long arg)
+static long sgx_ioc_enclave_set_attribute(struct file *filep, unsigned long arg)
{
struct sgx_enclave_set_attribute *params = (void *)arg;
struct sgx_encl *encl = filep->private_data;
@@ -810,8 +802,7 @@ static long sgx_ioc_enclave_set_attribute(struct file *filep, unsigned int cmd,
return ret;
}
-typedef long (*sgx_ioc_t)(struct file *filep, unsigned int cmd,
- unsigned long arg);
+typedef long (*sgx_ioc_t)(struct file *filep, unsigned long arg);
long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
{
@@ -839,5 +830,5 @@ long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
if (copy_from_user(data, (void __user *)arg, _IOC_SIZE(cmd)))
return -EFAULT;
- return handler(filep, cmd, (unsigned long)((void *)data));
+ return handler(filep, (unsigned long)((void *)data));
}
--
2.21.0
