OSDN Git Service

Staging: rtl8188eu: os_dep: Compression of lines for immediate return
authorVaishali Thakkar <vthakkar1994@gmail.com>
Sun, 14 Sep 2014 08:16:37 +0000 (13:46 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Sep 2014 23:26:01 +0000 (16:26 -0700)
This patch compresses two lines in to a single line in file rtw_android.c
if immediate return statement is found. It also removes variable bytes_written as
it is no longer needed.

It is done using script Coccinelle. And coccinelle uses following semantic
patch for this compression function:

@@
expression ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

Signed-off-by: Vaishali Thakkar<vthakkar1994@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/os_dep/rtw_android.c

index ca2736d..1718229 100644 (file)
@@ -106,23 +106,18 @@ static int rtw_android_get_link_speed(struct net_device *net, char *command,
                                      int total_len)
 {
        struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
-       int bytes_written;
        u16 link_speed;
 
        link_speed = rtw_get_cur_max_rate(padapter) / 10;
-       bytes_written = snprintf(command, total_len, "LinkSpeed %d",
+       return snprintf(command, total_len, "LinkSpeed %d",
                                 link_speed);
-       return bytes_written;
 }
 
 static int rtw_android_get_macaddr(struct net_device *net, char *command,
                                   int total_len)
 {
-       int bytes_written;
-
-       bytes_written = snprintf(command, total_len, "Macaddr = %pM",
+       return snprintf(command, total_len, "Macaddr = %pM",
                                 net->dev_addr);
-       return bytes_written;
 }
 
 static int android_set_cntry(struct net_device *net, char *command,