diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/ap1000 | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/ap1000')
| -rw-r--r-- | drivers/ap1000/ap.c | 27 | ||||
| -rw-r--r-- | drivers/ap1000/ddv.c | 1 | ||||
| -rw-r--r-- | drivers/ap1000/ringbuf.c | 1 |
3 files changed, 13 insertions, 16 deletions
diff --git a/drivers/ap1000/ap.c b/drivers/ap1000/ap.c index ae2071cf9..ce50c5edb 100644 --- a/drivers/ap1000/ap.c +++ b/drivers/ap1000/ap.c @@ -48,12 +48,10 @@ static int ap_fds[NUM_APDEVS]; static volatile int request_count = 0; -#ifdef MODULE static void ap_release(struct inode * inode, struct file * filp) { MOD_DEC_USE_COUNT; } -#endif static void ap_request(void) { @@ -247,20 +245,17 @@ void ap_open_reply(struct cap_request *creq) } static struct file_operations ap_fops = { - NULL, /* lseek - default */ - block_read, /* read - general block-dev read */ - block_write, /* write - general block-dev write */ - NULL, /* readdir - bad */ - NULL, /* poll */ - ap_ioctl, /* ioctl */ - NULL, /* mmap */ - ap_open, /* open */ -#ifndef MODULE - NULL, /* no special release code... */ -#else - ap_release, /* module needs to decrement use count */ -#endif - block_fsync, /* fsync */ + NULL, /* lseek - default */ + block_read, /* read - general block-dev read */ + block_write, /* write - general block-dev write */ + NULL, /* readdir - bad */ + NULL, /* poll */ + ap_ioctl, /* ioctl */ + NULL, /* mmap */ + ap_open, /* open */ + NULL, /* flush */ + ap_release, /* module needs to decrement use count */ + block_fsync, /* fsync */ }; diff --git a/drivers/ap1000/ddv.c b/drivers/ap1000/ddv.c index 2e7f492a5..4a21a5882 100644 --- a/drivers/ap1000/ddv.c +++ b/drivers/ap1000/ddv.c @@ -884,6 +884,7 @@ static struct file_operations ddv_fops = { ddv_ioctl, /* ioctl */ NULL, /* mmap */ ddv_open, /* open */ + NULL, /* flush */ ddv_release, block_fsync /* fsync */ }; diff --git a/drivers/ap1000/ringbuf.c b/drivers/ap1000/ringbuf.c index 905b8f069..d8f9b02c3 100644 --- a/drivers/ap1000/ringbuf.c +++ b/drivers/ap1000/ringbuf.c @@ -302,6 +302,7 @@ static struct file_operations proc_ringbuf_operations = { ringbuf_ioctl, /* ioctl */ NULL, /* mmap */ NULL, /* no special open code */ + NULL, /* flush */ NULL, /* no special release code */ NULL /* can't fsync */ }; |