From patchwork Sun Sep 11 05:58:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 75953 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp325603qgf; Sat, 10 Sep 2016 23:01:26 -0700 (PDT) X-Received: by 10.66.161.132 with SMTP id xs4mr21692257pab.140.1473573686179; Sat, 10 Sep 2016 23:01:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n79si13981316pfi.15.2016.09.10.23.01.25; Sat, 10 Sep 2016 23:01:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755156AbcIKGBS (ORCPT + 27 others); Sun, 11 Sep 2016 02:01:18 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:39915 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752735AbcIKGBP (ORCPT ); Sun, 11 Sep 2016 02:01:15 -0400 Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-12.nifty.com with ESMTP id u8B5wUBe001454; Sun, 11 Sep 2016 14:58:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u8B5wUBe001454 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1473573515; bh=v8/sU6SD19KW8gIHwHyYvUnaRSg5BN/DKfangPYoTPo=; h=From:To:Cc:Subject:Date:From; b=Py15ZvLoXOvWA5qWBJT4K8bN2yUUif5SdtaznsIHkhGJUntE3SsuBs9qkggd/xTvk tdZhIH6uTOERK5cZ+TlQFXQvYNxoo5INLGc6xqpR3MYXtL428drxOM852lroy4lPBa 4Ltnl0jHKHpTC/vGtG5syN54EQ2VkbVPl6gzyq3OdSiv+DeEOz7PwJP2oVBGgP4qhu LSE/VLnFa2RpYsbZixehWw0rG+UdpHRg13P1XKtY9iXXWDltWxpqQYUX+AJzr7hogH m4R5zcbvC8+EYoFbgTgLudG+CJGfDHH81gusSNFRwVbDTSwMeo0dz+WyXn1a+sQ9mr ZYTW7OXBvshyg== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: x86@kernel.org, Ingo Molnar Cc: Masahiro Yamada , Andrew Banman , Toshi Kani , Denys Vlasenko , Borislav Petkov , Paul Gortmaker , "H. Peter Anvin" , Alex Thorlton , Thomas Gleixner , linux-kernel@vger.kernel.org, Nathan Zimmer , Mike Travis , Daniel J Blueman , Dimitri Sivanich , Matt Fleming , Steffen Persvold , Wei Jiangang Subject: [PATCH v2] x86: squash lines for simple wrapper functions Date: Sun, 11 Sep 2016 14:58:21 +0900 Message-Id: <1473573502-27954-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unneeded variables and assignments. While we are here, let's fix the following as well: - Remove unnecessary parentheses - Remove unnecessary unsigned-suffix 'U' from constant values - Reword the comment in set_apic_id() (suggested by Thomas Gleixner) Signed-off-by: Masahiro Yamada --- Changes in v2: - Remove unneeded unsigned suffix 'u' - Clean up parentheses more - Reword the comment in set_apic_id() arch/x86/kernel/apic/apic_flat_64.c | 16 +++------------- arch/x86/kernel/apic/apic_numachip.c | 5 +---- arch/x86/kernel/apic/x2apic_uv_x.c | 7 ++----- arch/x86/mm/pat_rbtree.c | 4 +--- arch/x86/platform/uv/bios_uv.c | 7 ++----- arch/x86/platform/uv/tlb_uv.c | 6 +----- 6 files changed, 10 insertions(+), 35 deletions(-) -- 1.9.1 diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c index 5b2ae10..70796f5 100644 --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -116,27 +116,17 @@ static void flat_send_IPI_all(int vector) static unsigned int flat_get_apic_id(unsigned long x) { - unsigned int id; - - id = (((x)>>24) & 0xFFu); - - return id; + return (x >> 24) & 0xFF; } static unsigned long set_apic_id(unsigned int id) { - unsigned long x; - - x = ((id & 0xFFu)<<24); - return x; + return (id & 0xFF) << 24; } static unsigned int read_xapic_id(void) { - unsigned int id; - - id = flat_get_apic_id(apic_read(APIC_ID)); - return id; + return flat_get_apic_id(apic_read(APIC_ID)); } static int flat_apic_id_registered(void) diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c index 714d4fd..e08fe2c 100644 --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -40,10 +40,7 @@ static unsigned int numachip1_get_apic_id(unsigned long x) static unsigned long numachip1_set_apic_id(unsigned int id) { - unsigned long x; - - x = ((id & 0xffU) << 24); - return x; + return (id & 0xff) << 24; } static unsigned int numachip2_get_apic_id(unsigned long x) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index cb0673c..0f8cd92 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -533,11 +533,8 @@ static unsigned int x2apic_get_apic_id(unsigned long x) static unsigned long set_apic_id(unsigned int id) { - unsigned long x; - - /* maskout x2apic_extra_bits ? */ - x = id; - return x; + /* CHECKME: Do we need to mask out the xapic extra bits? */ + return id; } static unsigned int uv_read_apic_id(void) diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c index de391b7..159b52c 100644 --- a/arch/x86/mm/pat_rbtree.c +++ b/arch/x86/mm/pat_rbtree.c @@ -254,9 +254,7 @@ struct memtype *rbt_memtype_erase(u64 start, u64 end) struct memtype *rbt_memtype_lookup(u64 addr) { - struct memtype *data; - data = memtype_rb_lowest_match(&memtype_rbroot, addr, addr + PAGE_SIZE); - return data; + return memtype_rb_lowest_match(&memtype_rbroot, addr, addr + PAGE_SIZE); } #if defined(CONFIG_DEBUG_FS) diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c index 23f2f3e..b4d5e95 100644 --- a/arch/x86/platform/uv/bios_uv.c +++ b/arch/x86/platform/uv/bios_uv.c @@ -149,11 +149,8 @@ EXPORT_SYMBOL_GPL(uv_bios_change_memprotect); s64 uv_bios_reserved_page_pa(u64 buf, u64 *cookie, u64 *addr, u64 *len) { - s64 ret; - - ret = uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie, - (u64)addr, buf, (u64)len, 0); - return ret; + return uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie, + (u64)addr, buf, (u64)len, 0); } EXPORT_SYMBOL_GPL(uv_bios_reserved_page_pa); diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index fdb4d42..276e1b7 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -580,11 +580,7 @@ static int uv1_wait_completion(struct bau_desc *bau_desc, */ static unsigned long uv2_3_read_status(unsigned long offset, int rshft, int desc) { - unsigned long descriptor_status; - - descriptor_status = - ((read_lmmr(offset) >> rshft) & UV_ACT_STATUS_MASK) << 1; - return descriptor_status; + return ((read_lmmr(offset) >> rshft) & UV_ACT_STATUS_MASK) << 1; } /*