usb: misc: sisusbvga: compress return logic into one line

Simplify return logic to avoid unnecessary variable declaration
and assignment.

These issues were detected using Coccinelle and the following
semantic patch:

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 440d7fef58cc6d18f1b7e55f96ddba63b0a97043..30774e0aeadde4b88903ef688881ced60108ea03 100644 (file)
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -610,13 +610,11 @@ static int sisusb_write_memio_byte(struct sisusb_usb_data *sisusb, int type,
                u32 addr, u8 data)
 {
        struct sisusb_packet packet;
-       int ret;
 
        packet.header  = (1 << (addr & 3)) | (type << 6);
        packet.address = addr & ~3;
        packet.data    = data << ((addr & 3) << 3);
-       ret = sisusb_send_packet(sisusb, 10, &packet);
-       return ret;
+       return sisusb_send_packet(sisusb, 10, &packet);
 }
 
 static int sisusb_write_memio_word(struct sisusb_usb_data *sisusb, int type,
@@ -1333,13 +1331,11 @@ static int sisusb_write_pci_config(struct sisusb_usb_data *sisusb,
                int regnum, u32 data)
 {
        struct sisusb_packet packet;
-       int ret;
 
        packet.header = 0x008f;
        packet.address = regnum | 0x10000;
        packet.data = data;
-       ret = sisusb_send_packet(sisusb, 10, &packet);
-       return ret;
+       return sisusb_send_packet(sisusb, 10, &packet);
 }
 
 static int sisusb_read_pci_config(struct sisusb_usb_data *sisusb,
@@ -2982,14 +2978,11 @@ err_out:
 static long sisusb_compat_ioctl(struct file *f, unsigned int cmd,
                unsigned long arg)
 {
-       long retval;
-
        switch (cmd) {
        case SISUSB_GET_CONFIG_SIZE:
        case SISUSB_GET_CONFIG:
        case SISUSB_COMMAND:
-               retval = sisusb_ioctl(f, cmd, arg);
-               return retval;
+               return sisusb_ioctl(f, cmd, arg);
 
        default:
                return -ENOIOCTLCMD;