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/sbus/audio/audio.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/sbus/audio/audio.c')
| -rw-r--r-- | drivers/sbus/audio/audio.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/drivers/sbus/audio/audio.c b/drivers/sbus/audio/audio.c index 4c7e8003c..80957e0e3 100644 --- a/drivers/sbus/audio/audio.c +++ b/drivers/sbus/audio/audio.c @@ -87,8 +87,6 @@ static devfs_handle_t devfs_handle = NULL; #include <linux/poll.h> #define COPY_IN(arg, get) get_user(get, (int *)arg) #define COPY_OUT(arg, ret) put_user(ret, (int *)arg) -#define sparcaudio_release_ret sparcaudio_release -#define sparcaudioctl_release_ret sparcaudioctl_release #define sparcaudio_select sparcaudio_poll #endif @@ -1767,24 +1765,10 @@ static int sparcaudio_ioctl(struct inode * inode, struct file * file, return retval; } -static int sparcaudioctl_release_ret(struct inode * inode, struct file * file) -{ - MOD_DEC_USE_COUNT; - return 0; -} - -/* For 2.0 kernels */ -#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE < 0x20100 -static void sparcaudioctl_release(struct inode * inode, struct file * file) -{ - sparcaudioctl_release_ret(inode, file); -} -#endif - static struct file_operations sparcaudioctl_fops = { + owner: THIS_MODULE, poll: sparcaudio_select, ioctl: sparcaudio_ioctl, - release: sparcaudioctl_release, }; static int sparcaudio_open(struct inode * inode, struct file * file) @@ -1917,13 +1901,11 @@ static int sparcaudio_open(struct inode * inode, struct file * file) } } - MOD_INC_USE_COUNT; - /* Success! */ return 0; } -static int sparcaudio_release_ret(struct inode * inode, struct file * file) +static int sparcaudio_release(struct inode * inode, struct file * file) { struct sparcaudio_driver *drv = drivers[(MINOR(inode->i_rdev) >> SPARCAUDIO_DEVICE_SHIFT)]; @@ -1968,21 +1950,11 @@ static int sparcaudio_release_ret(struct inode * inode, struct file * file) /* Status changed. Signal control device */ kill_procs(drv->sd_siglist,SIGPOLL,S_MSG); - MOD_DEC_USE_COUNT; - wake_up_interruptible(&drv->open_wait); return 0; } -/* For 2.0 kernels */ -#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE < 0x20100 -static void sparcaudio_release(struct inode * inode, struct file * file) -{ - sparcaudio_release_ret(inode, file); -} -#endif - static struct file_operations sparcaudio_fops = { llseek: sparcaudio_lseek, read: sparcaudio_read, |