summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-08-17 20:11:44 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-08-24 20:00:48 +0200
commit014124ef6c43f2eadbf07318c03691c5305b6183 (patch)
treebde7c563c04a8464169e6da94d7a5a4ecd3dc328
parentaf2c2e1da1a898c8968281824ba8a4d9616670dc (diff)
downloadcryptodev-linux-014124ef6c43f2eadbf07318c03691c5305b6183.tar.gz
cryptodev-linux-014124ef6c43f2eadbf07318c03691c5305b6183.tar.xz
cryptodev-linux-014124ef6c43f2eadbf07318c03691c5305b6183.zip
Drop unnecessary "file *" argument to ncr_ioctl()
-rw-r--r--cryptodev_main.c2
-rw-r--r--ncr-int.h3
-rw-r--r--ncr.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/cryptodev_main.c b/cryptodev_main.c
index a056b44..da75672 100644
--- a/cryptodev_main.c
+++ b/cryptodev_main.c
@@ -828,7 +828,7 @@ cryptodev_ioctl(struct inode *inode, struct file *filp,
return 0;
default:
- return ncr_ioctl(pcr->ncr, filp, cmd, arg_);
+ return ncr_ioctl(pcr->ncr, cmd, arg_);
}
}
diff --git a/ncr-int.h b/ncr-int.h
index 4694cda..53df9df 100644
--- a/ncr-int.h
+++ b/ncr-int.h
@@ -104,8 +104,7 @@ struct ncr_lists {
void* ncr_init_lists(void);
void ncr_deinit_lists(struct ncr_lists *lst);
-int ncr_ioctl(struct ncr_lists*, struct file *filp,
- unsigned int cmd, unsigned long arg);
+int ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg);
/* key derivation */
int ncr_key_derive(struct ncr_lists *lst, void __user* arg);
diff --git a/ncr.c b/ncr.c
index 86c8c7a..81e3fa3 100644
--- a/ncr.c
+++ b/ncr.c
@@ -117,8 +117,7 @@ struct ncr_master_key_st st;
}
int
-ncr_ioctl(struct ncr_lists* lst, struct file *filp,
- unsigned int cmd, unsigned long arg_)
+ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg_)
{
void __user *arg = (void __user *)arg_;