From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753793AbcGVKRa (ORCPT ); Fri, 22 Jul 2016 06:17:30 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35352 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753337AbcGVKR2 (ORCPT ); Fri, 22 Jul 2016 06:17:28 -0400 From: Nadim almas To: gregkh@linuxfoundation.org Cc: mmarek@suse.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, Nadim almas Subject: [PATCH 32/32] Staging/octeon-usb/octeon-hcd.c: Compression of lines for immediate return This patch compresses two lines in to a single line in file octeon-hcd.c Date: Fri, 22 Jul 2016 03:17:17 -0700 Message-Id: <1469182637-4419-1-git-send-email-nadim.902@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Nadim Almas Acked-by: Julia Lawall --- Makefile | 2 +- drivers/staging/octeon-usb/octeon-hcd.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 4fb6bea..3d9d77a6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -rc4 +EXTRAVERSION = -eudyptula-rc4 NAME = Psychotic Stoned Sheep # *DOCUMENTATION* diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c index 17442b3..b801c8a 100644 --- a/drivers/staging/octeon-usb/octeon-hcd.c +++ b/drivers/staging/octeon-usb/octeon-hcd.c @@ -508,15 +508,15 @@ static int octeon_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, { int ret; - ret = octeon_alloc_temp_buffer(urb, mem_flags); - if (ret) - return ret; + + if (octeon_alloc_temp_buffer(urb, mem_flags)) + return octeon_alloc_temp_buffer(urb, mem_flags); - ret = usb_hcd_map_urb_for_dma(hcd, urb, mem_flags); - if (ret) + + if (usb_hcd_map_urb_for_dma(hcd, urb, mem_flags)) octeon_free_temp_buffer(urb); - return ret; + return usb_hcd_map_urb_for_dma(hcd, urb, mem_flags); } /** @@ -542,8 +542,8 @@ static void octeon_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb) */ static inline u32 cvmx_usb_read_csr32(struct octeon_hcd *usb, u64 address) { - u32 result = cvmx_read64_uint32(address ^ 4); - return result; + + return cvmx_read64_uint32(address ^ 4); } /** -- 2.7.4