diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2009-02-01 14:52:56 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2009-03-16 08:34:35 -0600 |
| commit | 60aa49243d09afc873f082567d2e3c16634ced84 (patch) | |
| tree | bb7c8d9668b35a3aa4e90d0a62500ac9d3e67f7f /sound | |
| parent | 76398425bb06b07cc3a3b1ce169c67dc9d6874ed (diff) | |
| download | kernel_goldelico_gta04-60aa49243d09afc873f082567d2e3c16634ced84.zip kernel_goldelico_gta04-60aa49243d09afc873f082567d2e3c16634ced84.tar.gz kernel_goldelico_gta04-60aa49243d09afc873f082567d2e3c16634ced84.tar.bz2 | |
Rationalize fasync return values
Most fasync implementations do something like:
return fasync_helper(...);
But fasync_helper() will return a positive value at times - a feature used
in at least one place. Thus, a number of other drivers do:
err = fasync_helper(...);
if (err < 0)
return err;
return 0;
In the interests of consistency and more concise code, it makes sense to
map positive return values onto zero where ->fasync() is called.
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/control.c | 7 | ||||
| -rw-r--r-- | sound/core/pcm_native.c | 4 | ||||
| -rw-r--r-- | sound/core/timer.c | 6 |
3 files changed, 4 insertions, 13 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 636b3b5..4b20fa2 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1373,12 +1373,9 @@ EXPORT_SYMBOL(snd_ctl_unregister_ioctl_compat); static int snd_ctl_fasync(int fd, struct file * file, int on) { struct snd_ctl_file *ctl; - int err; + ctl = file->private_data; - err = fasync_helper(fd, file, on, &ctl->fasync); - if (err < 0) - return err; - return 0; + return fasync_helper(fd, file, on, &ctl->fasync); } /* diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index a789efc..a75c194 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3246,9 +3246,7 @@ static int snd_pcm_fasync(int fd, struct file * file, int on) err = fasync_helper(fd, file, on, &runtime->fasync); out: unlock_kernel(); - if (err < 0) - return err; - return 0; + return err; } /* diff --git a/sound/core/timer.c b/sound/core/timer.c index 7965320..3f0050d 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1825,13 +1825,9 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, static int snd_timer_user_fasync(int fd, struct file * file, int on) { struct snd_timer_user *tu; - int err; tu = file->private_data; - err = fasync_helper(fd, file, on, &tu->fasync); - if (err < 0) - return err; - return 0; + return fasync_helper(fd, file, on, &tu->fasync); } static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, |