From patchwork Tue Sep 6 13:17:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 75510 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp543889qgf; Tue, 6 Sep 2016 06:17:07 -0700 (PDT) X-Received: by 10.194.119.100 with SMTP id kt4mr24898715wjb.122.1473167827235; Tue, 06 Sep 2016 06:17:07 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id uw3si11406740wjb.68.2016.09.06.06.17.06; Tue, 06 Sep 2016 06:17:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9F0BB4BA81; Tue, 6 Sep 2016 15:17:05 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hNvepxIJ1jLk; Tue, 6 Sep 2016 15:17:05 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B73C6B3815; Tue, 6 Sep 2016 15:16:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 45FB34BA35 for ; Tue, 6 Sep 2016 15:16:10 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d8FMhugihkcR for ; Tue, 6 Sep 2016 15:16:10 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by theia.denx.de (Postfix) with ESMTPS id A5A024BA29 for ; Tue, 6 Sep 2016 15:16:06 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id u86DFbix013304; Tue, 6 Sep 2016 22:15:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com u86DFbix013304 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1473167747; bh=rRBj7xgJFqv0hcYm7UR0Co4geZKNRfwDWjpkdrk7niQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zHvRHRudWxnTYewInOu3HgDYRVi4aTNOUVCXLEKJSYBh9AciJ2qomBNT01/214lzW 2JVUk6g+wDRjbfGM8VAQrNnsR8MQ/GIYYJ8TxtFCsje0pp9lyKMUYf6zjh1328qqCV PTBIxv9hqLJMQcgmF8vx87ROumzUaefhk2gDyoJyNVMEmw62zse3PiuZE19WyofLIv 01WLslVDXGme4z2lFaeARelSxIC3L/k2OGPhaYp17UU7zMlhnIoSCvvgQ16Fzg5SPt UZnhndVB435uimDocfZl2OF5vTfDHtFuSoSNdrFcVmP72149E3OO7mrMqghuuyMVfB 3vQNsV/HaVkAg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 6 Sep 2016 22:17:39 +0900 Message-Id: <1473167860-27465-9-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473167860-27465-1-git-send-email-yamada.masahiro@socionext.com> References: <1473167860-27465-1-git-send-email-yamada.masahiro@socionext.com> Cc: Marek Vasut , Stephen Warren , Vagrant Cascadian Subject: [U-Boot] [PATCH v3 8/8] drivers: squash lines for immediate return X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Remove unneeded variables and assignments. Signed-off-by: Masahiro Yamada --- Changes in v3: - more changes drivers/block/sym53c8xx.c | 5 ++--- drivers/ddr/fsl/ddr1_dimm_params.c | 12 ++---------- drivers/ddr/fsl/ddr2_dimm_params.c | 12 ++---------- drivers/ddr/marvell/a38x/ddr3_a38x.c | 6 +----- drivers/power/axp809.c | 8 +------- drivers/rtc/m48t35ax.c | 4 +--- 6 files changed, 9 insertions(+), 38 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/drivers/block/sym53c8xx.c b/drivers/block/sym53c8xx.c index 5daede7..50043e6 100644 --- a/drivers/block/sym53c8xx.c +++ b/drivers/block/sym53c8xx.c @@ -284,9 +284,8 @@ void scsi_low_level_init(int busdevfunc) */ unsigned long swap_script(unsigned long val) { - unsigned long tmp; - tmp = ((val>>24)&0xff) | ((val>>8)&0xff00) | ((val<<8)&0xff0000) | ((val<<24)&0xff000000); - return tmp; + return ((val >> 24) & 0xff) | ((val >> 8) & 0xff00) | + ((val << 8) & 0xff0000) | ((val << 24) & 0xff000000); } diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c index 00cdc22..369b325 100644 --- a/drivers/ddr/fsl/ddr1_dimm_params.c +++ b/drivers/ddr/fsl/ddr1_dimm_params.c @@ -108,22 +108,14 @@ static unsigned int byte40_table_ps[8] = { static unsigned int compute_trfc_ps_from_spd(unsigned char trctrfc_ext, unsigned char trfc) { - unsigned int trfc_ps; - - trfc_ps = (((trctrfc_ext & 0x1) * 256) + trfc) * 1000 + return ((trctrfc_ext & 0x1) * 256 + trfc) * 1000 + byte40_table_ps[(trctrfc_ext >> 1) & 0x7]; - - return trfc_ps; } static unsigned int compute_trc_ps_from_spd(unsigned char trctrfc_ext, unsigned char trc) { - unsigned int trc_ps; - - trc_ps = trc * 1000 + byte40_table_ps[(trctrfc_ext >> 4) & 0x7]; - - return trc_ps; + return trc * 1000 + byte40_table_ps[(trctrfc_ext >> 4) & 0x7]; } /* diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c index 59baf6b..af752cc 100644 --- a/drivers/ddr/fsl/ddr2_dimm_params.c +++ b/drivers/ddr/fsl/ddr2_dimm_params.c @@ -107,22 +107,14 @@ static unsigned int byte40_table_ps[8] = { static unsigned int compute_trfc_ps_from_spd(unsigned char trctrfc_ext, unsigned char trfc) { - unsigned int trfc_ps; - - trfc_ps = (((trctrfc_ext & 0x1) * 256) + trfc) * 1000 + return (((trctrfc_ext & 0x1) * 256) + trfc) * 1000 + byte40_table_ps[(trctrfc_ext >> 1) & 0x7]; - - return trfc_ps; } static unsigned int compute_trc_ps_from_spd(unsigned char trctrfc_ext, unsigned char trc) { - unsigned int trc_ps; - - trc_ps = trc * 1000 + byte40_table_ps[(trctrfc_ext >> 4) & 0x7]; - - return trc_ps; + return trc * 1000 + byte40_table_ps[(trctrfc_ext >> 4) & 0x7]; } /* diff --git a/drivers/ddr/marvell/a38x/ddr3_a38x.c b/drivers/ddr/marvell/a38x/ddr3_a38x.c index f469907..c082122 100644 --- a/drivers/ddr/marvell/a38x/ddr3_a38x.c +++ b/drivers/ddr/marvell/a38x/ddr3_a38x.c @@ -706,11 +706,7 @@ int ddr3_tip_ext_write(u32 dev_num, u32 if_id, u32 reg_addr, int ddr3_silicon_pre_init(void) { - int result; - - result = ddr3_silicon_init(); - - return result; + return ddr3_silicon_init(); } int ddr3_post_run_alg(void) diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c index c8b76cf..c5b608d 100644 --- a/drivers/power/axp809.c +++ b/drivers/power/axp809.c @@ -217,13 +217,7 @@ int axp_set_sw(bool on) int axp_init(void) { - int ret; - - ret = pmic_bus_init(); - if (ret) - return ret; - - return 0; + return pmic_bus_init(); } int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) diff --git a/drivers/rtc/m48t35ax.c b/drivers/rtc/m48t35ax.c index 021b91f..36011a5 100644 --- a/drivers/rtc/m48t35ax.c +++ b/drivers/rtc/m48t35ax.c @@ -127,10 +127,8 @@ void rtc_reset (void) static uchar rtc_read (uchar reg) { - uchar val; - val = *(unsigned char *) + return *(unsigned char *) ((CONFIG_SYS_NVRAM_BASE_ADDR + CONFIG_SYS_NVRAM_SIZE - 8) + reg); - return val; } static void rtc_write (uchar reg, uchar val)