OSDN Git Service

usb: misc: ftdi-elan: compress return logic into one line
authorGustavo A. R. Silva <garsilva@embeddedor.com>
Mon, 10 Jul 2017 03:22:46 +0000 (22:22 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jul 2017 11:13:44 +0000 (13:13 +0200)
Simplify return logic to avoid unnecessary variable declaration
and assignment.

This issue was 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>
drivers/usb/misc/ftdi-elan.c

index 8291499..c45904f 100644 (file)
@@ -305,9 +305,9 @@ static int ftdi_elan_command_engine(struct usb_ftdi *ftdi);
 static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi);
 static int ftdi_elan_hcd_init(struct usb_ftdi *ftdi)
 {
-       int result;
        if (ftdi->platform_dev.dev.parent)
                return -EBUSY;
+
        ftdi_elan_get_kref(ftdi);
        ftdi->platform_data.potpg = 100;
        ftdi->platform_data.reset = NULL;
@@ -324,8 +324,8 @@ static int ftdi_elan_hcd_init(struct usb_ftdi *ftdi)
        request_module("u132_hcd");
        dev_info(&ftdi->udev->dev, "registering '%s'\n",
                 ftdi->platform_dev.name);
-       result = platform_device_register(&ftdi->platform_dev);
-       return result;
+
+       return platform_device_register(&ftdi->platform_dev);
 }
 
 static void ftdi_elan_abandon_completions(struct usb_ftdi *ftdi)