{"id":666517,"url":"http://patchwork.ozlabs.org/api/patches/666517/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1473160910-20247-1-git-send-email-yamada.masahiro@socionext.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<1473160910-20247-1-git-send-email-yamada.masahiro@socionext.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/1473160910-20247-1-git-send-email-yamada.masahiro@socionext.com/","date":"2016-09-06T11:21:50","name":"powerpc: squash lines for simple wrapper functions","commit_ref":"7f2462acb6a995f2b0005192c0ba8eb2bce08da4","pull_url":null,"state":"accepted","archived":false,"hash":"364fcf7c8b3d4da59cf963053e9d9c339c38925a","submitter":{"id":65882,"url":"http://patchwork.ozlabs.org/api/people/65882/?format=json","name":"Masahiro Yamada","email":"yamada.masahiro@socionext.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1473160910-20247-1-git-send-email-yamada.masahiro@socionext.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/666517/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/666517/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3sT5lF3CyDz9s9N\n\tfor ;\n\tTue, 6 Sep 2016 22:39:37 +1000 (AEST)","from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3sT5lF203wzDsPR\n\tfor ;\n\tTue, 6 Sep 2016 22:39:37 +1000 (AEST)","from condef001-v.nifty.com (condef001-v.nifty.com [210.131.4.238])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3sT4Cp3SnkzDrqg\n\tfor ;\n\tTue, 6 Sep 2016 21:30:46 +1000 (AEST)","from conuserg-08.nifty.com ([10.26.8.71])by condef001-v.nifty.com\n\twith ESMTP id u86BLkxH001977\n\tfor ; Tue, 6 Sep 2016 20:21:59 +0900","from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp\n\t[153.142.97.92]) (authenticated)\n\tby conuserg-08.nifty.com with ESMTP id u86BKArP015256;\n\tTue, 6 Sep 2016 20:20:10 +0900"],"Authentication-Results":["ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=nifty.com header.i=@nifty.com header.b=JcEEvzh1;\n\tdkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=nifty.com header.i=@nifty.com header.b=JcEEvzh1;\n\tdkim-atps=neutral","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=nifty.com header.i=@nifty.com header.b=JcEEvzh1;\n\tdkim-atps=neutral"],"X-Greylist":"delayed 349 seconds by postgrey-1.35 at bilbo;\n\tTue, 06 Sep 2016 21:30:46 AEST","DKIM-Filter":"OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u86BKArP015256","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com;\n\ts=dec2015msa; t=1473160811;\n\tbh=sY6FQSyMGI5buaJtE3+HQin8Xnse0iXAOI8VpGK+ZY8=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=JcEEvzh14xi3iiONAQiCROys8SJme213ZDSqaWjAypm5+3osW7bY4uTQi0XCAryQI\n\tPDb/vjrtRsCzNwz2pvqwP6oC2Y7pbuVAJ5zoOtXrMhZztUV3sGdf1gC9uFnBZQ1UHF\n\t1zbts34iAMRQ5gKtZKK1CBo7068Q4XPgFXcCq/g9Su5vkV9ENlNKBxvTyD0abIgcMy\n\tzgGWwWi7wATglv0coIruTV5+P7bmOpXczmKxzUAGb0Gr4408xfaAaqEVBqTz/1kTe1\n\tk/Prc6w/Cqi90bI9hdpax8RIkwvXnKptJNpdSdgAD/AzkL9bn6Y/wmpk5DwA4QVzS6\n\t3Og/dNwKPHWcQ==","X-Nifty-SrcIP":"[153.142.97.92]","From":"Masahiro Yamada ","To":"linuxppc-dev@lists.ozlabs.org","Subject":"[PATCH] powerpc: squash lines for simple wrapper functions","Date":"Tue, 6 Sep 2016 20:21:50 +0900","Message-Id":"<1473160910-20247-1-git-send-email-yamada.masahiro@socionext.com>","X-Mailer":"git-send-email 1.9.1","X-Mailman-Approved-At":"Tue, 06 Sep 2016 22:37:05 +1000","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.22","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Rashmica Gupta , Kees Cook , \n\tkvm@vger.kernel.org,\n\t=?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= ,\n\tGeoff Levand , Simon Guo , \n\tKhem Raj , kvm-ppc@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\tMasahiro Yamada , \n\tPaul Mackerras , Paolo Bonzini ,\n\tCyril Bur , Alexander Graf ,\n\tAnshuman Khandual ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"Remove unneeded variables and assignments.\n\nSigned-off-by: Masahiro Yamada \n---\n\n arch/powerpc/kernel/ptrace.c | 42 ++++++++++-----------------------\n arch/powerpc/kvm/booke.c | 5 +---\n arch/powerpc/platforms/ps3/repository.c | 22 ++++-------------\n 3 files changed, 18 insertions(+), 51 deletions(-)","diff":"diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c\nindex bf91658..1979bae 100644\n--- a/arch/powerpc/kernel/ptrace.c\n+++ b/arch/powerpc/kernel/ptrace.c\n@@ -1714,11 +1714,8 @@ static int ppr_get(struct task_struct *target,\n \t\t unsigned int pos, unsigned int count,\n \t\t void *kbuf, void __user *ubuf)\n {\n-\tint ret;\n-\n-\tret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,\n-\t\t\t\t&target->thread.ppr, 0, sizeof(u64));\n-\treturn ret;\n+\treturn user_regset_copyout(&pos, &count, &kbuf, &ubuf,\n+\t\t\t\t &target->thread.ppr, 0, sizeof(u64));\n }\n \n static int ppr_set(struct task_struct *target,\n@@ -1726,11 +1723,8 @@ static int ppr_set(struct task_struct *target,\n \t\t unsigned int pos, unsigned int count,\n \t\t const void *kbuf, const void __user *ubuf)\n {\n-\tint ret;\n-\n-\tret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,\n-\t\t\t\t&target->thread.ppr, 0, sizeof(u64));\n-\treturn ret;\n+\treturn user_regset_copyin(&pos, &count, &kbuf, &ubuf,\n+\t\t\t\t &target->thread.ppr, 0, sizeof(u64));\n }\n \n static int dscr_get(struct task_struct *target,\n@@ -1738,22 +1732,16 @@ static int dscr_get(struct task_struct *target,\n \t\t unsigned int pos, unsigned int count,\n \t\t void *kbuf, void __user *ubuf)\n {\n-\tint ret;\n-\n-\tret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,\n-\t\t\t\t&target->thread.dscr, 0, sizeof(u64));\n-\treturn ret;\n+\treturn user_regset_copyout(&pos, &count, &kbuf, &ubuf,\n+\t\t\t\t &target->thread.dscr, 0, sizeof(u64));\n }\n static int dscr_set(struct task_struct *target,\n \t\t const struct user_regset *regset,\n \t\t unsigned int pos, unsigned int count,\n \t\t const void *kbuf, const void __user *ubuf)\n {\n-\tint ret;\n-\n-\tret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,\n-\t\t\t\t&target->thread.dscr, 0, sizeof(u64));\n-\treturn ret;\n+\treturn user_regset_copyin(&pos, &count, &kbuf, &ubuf,\n+\t\t\t\t &target->thread.dscr, 0, sizeof(u64));\n }\n #endif\n #ifdef CONFIG_PPC_BOOK3S_64\n@@ -1762,22 +1750,16 @@ static int tar_get(struct task_struct *target,\n \t\t unsigned int pos, unsigned int count,\n \t\t void *kbuf, void __user *ubuf)\n {\n-\tint ret;\n-\n-\tret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,\n-\t\t\t\t&target->thread.tar, 0, sizeof(u64));\n-\treturn ret;\n+\treturn user_regset_copyout(&pos, &count, &kbuf, &ubuf,\n+\t\t\t\t &target->thread.tar, 0, sizeof(u64));\n }\n static int tar_set(struct task_struct *target,\n \t\t const struct user_regset *regset,\n \t\t unsigned int pos, unsigned int count,\n \t\t const void *kbuf, const void __user *ubuf)\n {\n-\tint ret;\n-\n-\tret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,\n-\t\t\t\t&target->thread.tar, 0, sizeof(u64));\n-\treturn ret;\n+\treturn user_regset_copyin(&pos, &count, &kbuf, &ubuf,\n+\t\t\t\t &target->thread.tar, 0, sizeof(u64));\n }\n \n static int ebb_active(struct task_struct *target,\ndiff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\nindex 02b4672..881e136 100644\n--- a/arch/powerpc/kvm/booke.c\n+++ b/arch/powerpc/kvm/booke.c\n@@ -1767,10 +1767,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)\n int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,\n struct kvm_translation *tr)\n {\n-\tint r;\n-\n-\tr = kvmppc_core_vcpu_translate(vcpu, tr);\n-\treturn r;\n+\treturn kvmppc_core_vcpu_translate(vcpu, tr);\n }\n \n int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)\ndiff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c\nindex 814a7ea..50dbaf2 100644\n--- a/arch/powerpc/platforms/ps3/repository.c\n+++ b/arch/powerpc/platforms/ps3/repository.c\n@@ -170,14 +170,8 @@ int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,\n \n int ps3_repository_read_bus_id(unsigned int bus_index, u64 *bus_id)\n {\n-\tint result;\n-\n-\tresult = read_node(PS3_LPAR_ID_PME,\n-\t\tmake_first_field(\"bus\", bus_index),\n-\t\tmake_field(\"id\", 0),\n-\t\t0, 0,\n-\t\tbus_id, NULL);\n-\treturn result;\n+\treturn read_node(PS3_LPAR_ID_PME, make_first_field(\"bus\", bus_index),\n+\t\t\t make_field(\"id\", 0), 0, 0, bus_id, NULL);\n }\n \n int ps3_repository_read_bus_type(unsigned int bus_index,\n@@ -224,15 +218,9 @@ int ps3_repository_read_dev_str(unsigned int bus_index,\n int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,\n \tu64 *dev_id)\n {\n-\tint result;\n-\n-\tresult = read_node(PS3_LPAR_ID_PME,\n-\t\tmake_first_field(\"bus\", bus_index),\n-\t\tmake_field(\"dev\", dev_index),\n-\t\tmake_field(\"id\", 0),\n-\t\t0,\n-\t\tdev_id, NULL);\n-\treturn result;\n+\treturn read_node(PS3_LPAR_ID_PME, make_first_field(\"bus\", bus_index),\n+\t\t\t make_field(\"dev\", dev_index), make_field(\"id\", 0), 0,\n+\t\t\t dev_id, NULL);\n }\n \n int ps3_repository_read_dev_type(unsigned int bus_index,\n","prefixes":[]}