From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez3LB-0004hQ-3V for qemu-devel@nongnu.org; Thu, 22 Mar 2018 12:45:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez3LA-0002kp-32 for qemu-devel@nongnu.org; Thu, 22 Mar 2018 12:45:25 -0400 References: <20180322161226.29796-1-lvivier@redhat.com> <20180322161226.29796-5-lvivier@redhat.com> From: Eric Blake Message-ID: <5a2e612c-368c-bc36-a852-0ce29bc36ab4@redhat.com> Date: Thu, 22 Mar 2018 11:45:02 -0500 MIME-Version: 1.0 In-Reply-To: <20180322161226.29796-5-lvivier@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 4/4] Remove unnecessary variables for function return value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laurent Vivier , qemu-devel@nongnu.org Cc: Peter Crosthwaite , "=?UTF-8?Q?Daniel_P._Berrang=c3=a9?=" , "Dr. David Alan Gilbert" , Paolo Bonzini , David Gibson , Kevin Wolf , Richard Henderson , qemu-arm@nongnu.org, Jason Wang , Max Reitz , Fam Zheng , qemu-trivial@nongnu.org, Alexander Graf , qemu-ppc@nongnu.org, Peter Maydell , Alberto Garcia , qemu-block@nongnu.org, Igor Mitsyanko , Yongbok Kim , "Michael S. Tsirkin" , Aurelien Jarno , Eduardo Habkost , Max Filippov , Markus Armbruster On 03/22/2018 11:12 AM, Laurent Vivier wrote: > Re-run Coccinelle script scripts/coccinelle/return_directly.cocci > > Signed-off-by: Laurent Vivier > --- > +++ b/hw/arm/exynos4210.c > @@ -156,12 +156,7 @@ void exynos4210_write_secondary(ARMCPU *cpu, > > static uint64_t exynos4210_calc_affinity(int cpu) > { > - uint64_t mp_affinity; > - > - /* Exynos4210 has 0x9 as cluster ID */ > - mp_affinity = (0x9 << ARM_AFF1_SHIFT) | cpu; > - > - return mp_affinity; > + return (0x9 << ARM_AFF1_SHIFT) | cpu; Unchanged by this rewrite, but since this is converting a signed 32-bit int to an unsigned 64-bit value, are we sure that the upper 32 bits are always set correctly? (Using unsigned values earlier in the expression would require less head-scratching on whether it is correct). Any changes should be a separate fix by the file's maintainer. > +++ b/hw/misc/mos6522.c > @@ -176,12 +176,8 @@ static void mos6522_set_sr_int(MOS6522State *s) > > static uint64_t mos6522_get_counter_value(MOS6522State *s, MOS6522Timer *ti) > { > - uint64_t d; > - > - d = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ti->load_time, > + return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ti->load_time, > ti->frequency, NANOSECONDS_PER_SECOND); Coccinelle missed that indentation is now off here. > +++ b/hw/ppc/pnv_lpc.c > @@ -125,25 +125,15 @@ static int pnv_lpc_dt_xscom(PnvXScomInterface *dev, void *fdt, int xscom_offset) > static bool opb_read(PnvLpcController *lpc, uint32_t addr, uint8_t *data, > int sz) > { > - bool success; > - > - /* XXX Handle access size limits and FW read caching here */ > - success = !address_space_rw(&lpc->opb_as, addr, MEMTXATTRS_UNSPECIFIED, > + return !address_space_rw(&lpc->opb_as, addr, MEMTXATTRS_UNSPECIFIED, > data, sz, false); and here. > +++ b/target/xtensa/translate.c > @@ -1272,11 +1272,8 @@ XtensaOpcodeOps * > xtensa_find_opcode_ops(const XtensaOpcodeTranslators *t, > const char *name) > { > - XtensaOpcodeOps *ops; > - > - ops = bsearch(name, t->opcode, t->num_opcodes, > + return bsearch(name, t->opcode, t->num_opcodes, > sizeof(XtensaOpcodeOps), compare_opcode_ops); and here -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org