Merge branch 'vfree' into for-next

[karo-tx-linux.git] / drivers / staging / silicom / bpctl_mod.c

diff --git a/drivers/staging/silicom/bpctl_mod.c b/drivers/staging/silicom/bpctl_mod.c
index e2da0fb3f98e0ece4e2e27d9709dfa7f3d8ccf41..3117559c041b25111380276d66653a2732371e88 100644 (file)
--- a/drivers/staging/silicom/bpctl_mod.c
+++ b/drivers/staging/silicom/bpctl_mod.c
@@ -35,7 +35,6 @@
 #define BP_MOD_DESCR "Silicom Bypass-SD Control driver"
 #define BP_SYNC_FLAG 1
 
-static int Device_Open = 0;
 static int major_num = 0;
 
 MODULE_AUTHOR("Anna Lukin, annal@silicom.co.il");
@@ -289,27 +288,6 @@ static struct notifier_block bp_notifier_block = {
        .notifier_call = bp_device_event,
 };
 
-static int device_open(struct inode *inode, struct file *file)
-{
-#ifdef DEBUG
-       printk("device_open(%p)\n", file);
-#endif
-       Device_Open++;
-/*
-* Initialize the message
-*/
-       return SUCCESS;
-}
-
-static int device_release(struct inode *inode, struct file *file)
-{
-#ifdef DEBUG
-       printk("device_release(%p,%p)\n", inode, file);
-#endif
-       Device_Open--;
-       return SUCCESS;
-}
-
 int is_bypass_fn(bpctl_dev_t *pbpctl_dev);
 int wdt_time_left(bpctl_dev_t *pbpctl_dev);
 
@@ -5803,11 +5781,9 @@ static long device_ioctl(struct file *file,      /* see include/linux/fs.h */
        return ret;
 }
 
-struct file_operations Fops = {
+static const struct file_operations Fops = {
        .owner = THIS_MODULE,
        .unlocked_ioctl = device_ioctl,
-       .open = device_open,
-       .release = device_release,      /* a.k.a. close */
 };
 
 #ifndef PCI_DEVICE