aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlison Schofield <amsfield22@gmail.com>2016-02-10 10:34:00 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-11 20:00:30 -0800
commit474be12de61c60503ee6164b65afd5608e60b80c (patch)
tree99d37a30960c07028569f887e1cf8cd80515afb0 /drivers
parentstaging: speakup: compress return logic into one line (diff)
downloadlinux-dev-474be12de61c60503ee6164b65afd5608e60b80c.tar.xz
linux-dev-474be12de61c60503ee6164b65afd5608e60b80c.zip
staging: gdm72xx: compress return logic into one line
Simplify function returns by merging assignment and return into one command line. Found with Coccinelle @@ expression e, ret; @@ -ret = +return e; -return ret; Signed-off-by: Alison Schofield <amsfield22@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/gdm72xx/netlink_k.c3
-rw-r--r--drivers/staging/gdm72xx/usb_boot.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index b7e5e706d37a..cf0b47cb1ceb 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -151,6 +151,5 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
group, type, len, ret);
}
- ret = 0;
- return ret;
+ return 0;
}
diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c
index 39ca34031a6b..30829875da2e 100644
--- a/drivers/staging/gdm72xx/usb_boot.c
+++ b/drivers/staging/gdm72xx/usb_boot.c
@@ -357,7 +357,5 @@ int usb_emergency(struct usb_device *usbdev)
return ret;
dev_info(&usbdev->dev, "GCT Emergency: Filesystem download success.\n");
- ret = em_fw_reset(usbdev);
-
- return ret;
+ return em_fw_reset(usbdev);
}