diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /drivers/char/isicom.c | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'drivers/char/isicom.c')
| -rw-r--r-- | drivers/char/isicom.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 958fbf776..52c6b5f19 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -86,8 +86,6 @@ static char re_schedule = 1; static unsigned long tx_count = 0; #endif -static int ISILoad_open(struct inode *inode, struct file *filp); -static int ISILoad_release(struct inode *inode, struct file *filp); static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static void isicom_tx(unsigned long _data); @@ -109,9 +107,8 @@ static signed char linuxb_to_isib[] = { */ static struct file_operations ISILoad_fops = { + owner: THIS_MODULE, ioctl: ISILoad_ioctl, - open: ISILoad_open, - release: ISILoad_release, }; struct miscdevice isiloader_device = { @@ -129,24 +126,6 @@ extern inline int WaitTillCardIsFree(unsigned short base) return 1; } -static int ISILoad_open(struct inode *inode, struct file *filp) -{ -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISILoad:Firmware loader Opened!!!\n"); -#endif - MOD_INC_USE_COUNT; - return 0; -} - -static int ISILoad_release(struct inode *inode, struct file *filp) -{ -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISILoad:Firmware loader Close(Release)d\n",); -#endif - MOD_DEC_USE_COUNT; - return 0; -} - static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { |