diff options
author | Gustavo A. R. Silva <garsilva@embeddedor.com> | 2017-07-09 23:22:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-17 07:13:44 -0400 |
commit | 020e03b78312ab0df1fd3c4ea62e675724cd18cf (patch) | |
tree | f9ca2feccb6b481baf1ec1e4daa3af05883dc700 | |
parent | e6f9e13b62bad739a9fc095e061dc9fc8cf4168c (diff) |
usb: misc: ftdi-elan: compress return logic into one line
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>
-rw-r--r-- | drivers/usb/misc/ftdi-elan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index 8291499d0581..c45904f08274 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c | |||
@@ -305,9 +305,9 @@ static int ftdi_elan_command_engine(struct usb_ftdi *ftdi); | |||
305 | static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi); | 305 | static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi); |
306 | static int ftdi_elan_hcd_init(struct usb_ftdi *ftdi) | 306 | static int ftdi_elan_hcd_init(struct usb_ftdi *ftdi) |
307 | { | 307 | { |
308 | int result; | ||
309 | if (ftdi->platform_dev.dev.parent) | 308 | if (ftdi->platform_dev.dev.parent) |
310 | return -EBUSY; | 309 | return -EBUSY; |
310 | |||
311 | ftdi_elan_get_kref(ftdi); | 311 | ftdi_elan_get_kref(ftdi); |
312 | ftdi->platform_data.potpg = 100; | 312 | ftdi->platform_data.potpg = 100; |
313 | ftdi->platform_data.reset = NULL; | 313 | ftdi->platform_data.reset = NULL; |
@@ -324,8 +324,8 @@ static int ftdi_elan_hcd_init(struct usb_ftdi *ftdi) | |||
324 | request_module("u132_hcd"); | 324 | request_module("u132_hcd"); |
325 | dev_info(&ftdi->udev->dev, "registering '%s'\n", | 325 | dev_info(&ftdi->udev->dev, "registering '%s'\n", |
326 | ftdi->platform_dev.name); | 326 | ftdi->platform_dev.name); |
327 | result = platform_device_register(&ftdi->platform_dev); | 327 | |
328 | return result; | 328 | return platform_device_register(&ftdi->platform_dev); |
329 | } | 329 | } |
330 | 330 | ||
331 | static void ftdi_elan_abandon_completions(struct usb_ftdi *ftdi) | 331 | static void ftdi_elan_abandon_completions(struct usb_ftdi *ftdi) |