usb: f_fs: replace unnecessary goto with a return

In ffs_epfile_io error label points to a return path which includes
a kfree(data) call.  However, at the beginning of the function data is
always NULL so some of the early ‘goto error’ can safely be replaced
with a trivial return statement.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 13842205b84973482373be79ae4fdc9fc1e7b26d..c4e6395c1271cb43e15a1bb87d8bc6890f4c58d7 100644 (file)
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -690,32 +690,24 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
        int halt;
 
        /* Are we still active? */
-       if (WARN_ON(epfile->ffs->state != FFS_ACTIVE)) {
-               ret = -ENODEV;
-               goto error;
-       }
+       if (WARN_ON(epfile->ffs->state != FFS_ACTIVE))
+               return -ENODEV;
 
        /* Wait for endpoint to be enabled */
        ep = epfile->ep;
        if (!ep) {
-               if (file->f_flags & O_NONBLOCK) {
-                       ret = -EAGAIN;
-                       goto error;
-               }
+               if (file->f_flags & O_NONBLOCK)
+                       return -EAGAIN;
 
                ret = wait_event_interruptible(epfile->wait, (ep = epfile->ep));
-               if (ret) {
-                       ret = -EINTR;
-                       goto error;
-               }
+               if (ret)
+                       return -EINTR;
        }
 
        /* Do we halt? */
        halt = (!io_data->read == !epfile->in);
-       if (halt && epfile->isoc) {
-               ret = -EINVAL;
-               goto error;
-       }
+       if (halt && epfile->isoc)
+               return -EINVAL;
 
        /* Allocate & copy */
        if (!halt) {