From 474be12de61c60503ee6164b65afd5608e60b80c Mon Sep 17 00:00:00 2001 From: Alison Schofield Date: Wed, 10 Feb 2016 10:34:00 -0800 Subject: [PATCH] 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 Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gdm72xx/netlink_k.c | 3 +-- drivers/staging/gdm72xx/usb_boot.c | 4 +--- 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); } -- 2.11.0