diff options
author | Jonathan Corbet <corbet@lwn.net> | 2009-02-01 16:52:56 -0500 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2009-03-16 10:34:35 -0400 |
commit | 60aa49243d09afc873f082567d2e3c16634ced84 (patch) | |
tree | bb7c8d9668b35a3aa4e90d0a62500ac9d3e67f7f /drivers/scsi/sg.c | |
parent | 76398425bb06b07cc3a3b1ce169c67dc9d6874ed (diff) |
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 'drivers/scsi/sg.c')
-rw-r--r-- | drivers/scsi/sg.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 516925d8b570..b4ef2f84ea32 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -1154,7 +1154,6 @@ sg_poll(struct file *filp, poll_table * wait) | |||
1154 | static int | 1154 | static int |
1155 | sg_fasync(int fd, struct file *filp, int mode) | 1155 | sg_fasync(int fd, struct file *filp, int mode) |
1156 | { | 1156 | { |
1157 | int retval; | ||
1158 | Sg_device *sdp; | 1157 | Sg_device *sdp; |
1159 | Sg_fd *sfp; | 1158 | Sg_fd *sfp; |
1160 | 1159 | ||
@@ -1163,8 +1162,7 @@ sg_fasync(int fd, struct file *filp, int mode) | |||
1163 | SCSI_LOG_TIMEOUT(3, printk("sg_fasync: %s, mode=%d\n", | 1162 | SCSI_LOG_TIMEOUT(3, printk("sg_fasync: %s, mode=%d\n", |
1164 | sdp->disk->disk_name, mode)); | 1163 | sdp->disk->disk_name, mode)); |
1165 | 1164 | ||
1166 | retval = fasync_helper(fd, filp, mode, &sfp->async_qp); | 1165 | return fasync_helper(fd, filp, mode, &sfp->async_qp); |
1167 | return (retval < 0) ? retval : 0; | ||
1168 | } | 1166 | } |
1169 | 1167 | ||
1170 | static int | 1168 | static int |