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>

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index f4374437a0331cc4260393f646a86762b35073dd..fd3dced9777610c25b2d4f106eaca349a6a5de34 100644 (file)
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -888,12 +888,7 @@ found:
 
 static int sonypi_misc_fasync(int fd, struct file *filp, int on)
 {
-       int retval;
-
-       retval = fasync_helper(fd, filp, on, &sonypi_device.fifo_async);
-       if (retval < 0)
-               return retval;
-       return 0;
+       return fasync_helper(fd, filp, on, &sonypi_device.fifo_async);
 }
 
 static int sonypi_misc_release(struct inode *inode, struct file *file)

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index f52663ebe016f5ea194b5aa2a403881ebb2e0448..e13cb62bbaee24bc2c2a2cd2f0475d2412f474cd 100644 (file)
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -337,14 +337,10 @@ int drm_fasync(int fd, struct file *filp, int on)
 {
        struct drm_file *priv = filp->private_data;
        struct drm_device *dev = priv->minor->dev;
-       int retcode;
 
        DRM_DEBUG("fd = %d, device = 0x%lx\n", fd,
                  (long)old_encode_dev(priv->minor->device));
-       retcode = fasync_helper(fd, filp, on, &dev->buf_async);
-       if (retcode < 0)
-               return retcode;
-       return 0;
+       return fasync_helper(fd, filp, on, &dev->buf_async);
 }
 EXPORT_SYMBOL(drm_fasync);
 

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 4940e4d70c2d1ef6ef02804cc45222c7e5201c60..3a7b4fe192a3ee18a9114215fa939b2cdb62617d 100644 (file)
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -227,12 +227,9 @@ void hiddev_report_event(struct hid_device *hid, struct hid_report *report)
  */
 static int hiddev_fasync(int fd, struct file *file, int on)
 {
-       int retval;
        struct hiddev_list *list = file->private_data;
 
-       retval = fasync_helper(fd, file, on, &list->fasync);
-
-       return retval < 0 ? retval : 0;
+       return fasync_helper(fd, file, on, &list->fasync);
 }
 
 

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 3838bc4acabac07b01b2c7b2488d07d825aa28ae..cb15bfa38d70b5a51b258f30d35de05ce424c5cd 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1325,11 +1325,7 @@ static int dv1394_fasync(int fd, struct file *file, int on)
 
        struct video_card *video = file_to_video_card(file);
 
-       int retval = fasync_helper(fd, file, on, &video->fasync);
-
-       if (retval < 0)
-               return retval;
-        return 0;
+       return fasync_helper(fd, file, on, &video->fasync);
 }
 
 static ssize_t dv1394_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index ed8baa0aec3cce31023a2e97557db22ab5a7f7c6..7a7a026ba71211b205cefd2f4590c1e7c5da20e2 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -94,11 +94,8 @@ static void evdev_event(struct input_handle *handle,
 static int evdev_fasync(int fd, struct file *file, int on)
 {
        struct evdev_client *client = file->private_data;
-       int retval;
-
-       retval = fasync_helper(fd, file, on, &client->fasync);
 
-       return retval < 0 ? retval : 0;
+       return fasync_helper(fd, file, on, &client->fasync);
 }
 
 static int evdev_flush(struct file *file, fl_owner_t id)

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 6f2366220a50bd9c415f0b6986ded77bd309ffe0..4224f0112849cb8b7b48935c96060502d01a2a7d 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -159,12 +159,9 @@ static void joydev_event(struct input_handle *handle,
 
 static int joydev_fasync(int fd, struct file *file, int on)
 {
-       int retval;
        struct joydev_client *client = file->private_data;
 
-       retval = fasync_helper(fd, file, on, &client->fasync);
-
-       return retval < 0 ? retval : 0;
+       return fasync_helper(fd, file, on, &client->fasync);
 }
 
 static void joydev_free(struct device *dev)

diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index ef99a7e6d40cb8741a18a796048ea78a32d2cc3b..17fd6d46d082eafe8e124a6f78de65cc53e17c73 100644 (file)
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -403,12 +403,9 @@ static void mousedev_event(struct input_handle *handle,
 
 static int mousedev_fasync(int fd, struct file *file, int on)
 {
-       int retval;
        struct mousedev_client *client = file->private_data;
 
-       retval = fasync_helper(fd, file, on, &client->fasync);
-
-       return retval < 0 ? retval : 0;
+       return fasync_helper(fd, file, on, &client->fasync);
 }
 
 static void mousedev_free(struct device *dev)

diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 06bbd0e74c6f96d37ff423c60f78eebe92f8fb83..b03009bb74684a2edaf15f6d4f31f7a9904b31bb 100644 (file)
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -58,10 +58,8 @@ static unsigned int serio_raw_no;
 static int serio_raw_fasync(int fd, struct file *file, int on)
 {
        struct serio_raw_list *list = file->private_data;
-       int retval;
 
-       retval = fasync_helper(fd, file, on, &list->fasync);
-       return retval < 0 ? retval : 0;
+       return fasync_helper(fd, file, on, &list->fasync);
 }
 
 static struct serio_raw *serio_raw_locate(int minor)

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index d80b72e22dea6be26d69b4e2d0fd016541a546f8..ce753e9c576b08ca06ec8467077022f851cd5414 100644 (file)
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -993,8 +993,8 @@ static struct fasync_struct *fasync[256] = { NULL, };
 static int cosa_fasync(struct inode *inode, struct file *file, int on)
 {
         int port = iminor(inode);
-        int rv = fasync_helper(inode, file, on, &fasync[port]);
-        return rv < 0 ? rv : 0;
+
+       return fasync_helper(inode, file, on, &fasync[port]);
 }
 #endif
 

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 537959d07148a9c3f1e76ec0637b6de3c65ac1cb..bc8996c849acbd0ac163db6d48744370c7df5734 100644 (file)
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1917,12 +1917,7 @@ static struct sonypi_compat_s sonypi_compat = {
 
 static int sonypi_misc_fasync(int fd, struct file *filp, int on)
 {
-       int retval;
-
-       retval = fasync_helper(fd, filp, on, &sonypi_compat.fifo_async);
-       if (retval < 0)
-               return retval;
-       return 0;
+       return fasync_helper(fd, filp, on, &sonypi_compat.fifo_async);
 }
 
 static int sonypi_misc_release(struct inode *inode, struct file *file)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 516925d8b570c3fab05d5d1b0a6b729e0ebce395..b4ef2f84ea32ae6a5e3dca480da58ef486345ce2 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1154,7 +1154,6 @@ sg_poll(struct file *filp, poll_table * wait)
 static int
 sg_fasync(int fd, struct file *filp, int mode)
 {
-       int retval;
        Sg_device *sdp;
        Sg_fd *sfp;
 
@@ -1163,8 +1162,7 @@ sg_fasync(int fd, struct file *filp, int mode)
        SCSI_LOG_TIMEOUT(3, printk("sg_fasync: %s, mode=%d\n",
                                   sdp->disk->disk_name, mode));
 
-       retval = fasync_helper(fd, filp, mode, &sfp->async_qp);
-       return (retval < 0) ? retval : 0;
+       return fasync_helper(fd, filp, mode, &sfp->async_qp);
 }
 
 static int

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 431bb645927363c714d375d067e0f09365ed8e66..d865ca66ccba1a6fb331150a75c7d50b5545e87c 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -184,6 +184,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
                error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
                if (error < 0)
                        goto out;
+               if (error > 0)
+                       error = 0;
        }
        spin_lock(&filp->f_lock);
        filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK);

diff --git a/fs/ioctl.c b/fs/ioctl.c
index e8e89edba576d43480611a9f9cf0ca66b62d99d7..ac2d47e439265c1622199ed17b00315c475a4a4f 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -432,7 +432,7 @@ static int ioctl_fioasync(unsigned int fd, struct file *filp,
                else
                        error = -ENOTTY;
        }
-       return error;
+       return error < 0 ? error : 0;
 }
 
 static int ioctl_fsfreeze(struct file *filp)

diff --git a/fs/pipe.c b/fs/pipe.c
index 14f502b89cf5c2eb46cf8f2fb476d055a7fb118a..94ad15967cf90ddc04467a093247b1da7879a3fd 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -667,10 +667,7 @@ pipe_read_fasync(int fd, struct file *filp, int on)
        retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_readers);
        mutex_unlock(&inode->i_mutex);
 
-       if (retval < 0)
-               return retval;
-
-       return 0;
+       return retval;
 }
 
 
@@ -684,10 +681,7 @@ pipe_write_fasync(int fd, struct file *filp, int on)
        retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_writers);
        mutex_unlock(&inode->i_mutex);
 
-       if (retval < 0)
-               return retval;
-
-       return 0;
+       return retval;
 }
 
 
@@ -706,11 +700,7 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on)
                        fasync_helper(-1, filp, 0, &pipe->fasync_readers);
        }
        mutex_unlock(&inode->i_mutex);
-
-       if (retval < 0)
-               return retval;
-
-       return 0;
+       return retval;
 }
 
 

diff --git a/sound/core/control.c b/sound/core/control.c
index 636b3b52ef8bdd56cc2f7eaccf6a779ca8c9c841..4b20fa2b7e6d72db78821ac4c39aba2f68d71c56 100644 (file)
--- 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 a789efc9df3971e46b4f2535d57a4329d5b27dc2..a75c194e629ec5f7fe2ff82a783b07f6c4245abe 100644 (file)
--- 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 796532081e8153125a6067bdee899ecf2869c909..3f0050d0b71eefbd27edbb5b3da245a91c6b85ac 100644 (file)
--- 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,