From 9be385980d37e8f4fd33f605f5fb1c3d144170a8 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Mon, 13 Jun 2016 18:57:58 -0300 Subject: coccinelle: Remove unnecessary variables for function return value Use Coccinelle script to replace 'ret = E; return ret' with 'return E'. The script will do the substitution only when the function return type and variable type are the same. Manual fixups: * audio/audio.c: coding style of "read (...)" and "write (...)" * block/qcow2-cluster.c: wrap line to make it shorter * block/qcow2-refcount.c: change indentation of wrapped line * target-tricore/op_helper.c: fix coding style of "remainder|quotient" * target-mips/dsp_helper.c: reverted changes because I don't want to argue about checkpatch.pl * ui/qemu-pixman.c: fix line indentation * block/rbd.c: restore blank line between declarations and statements Reviewed-by: Eric Blake Signed-off-by: Eduardo Habkost Message-Id: <1465855078-19435-4-git-send-email-ehabkost@redhat.com> Reviewed-by: Markus Armbruster [Unused Coccinelle rule name dropped along with a redundant comment; whitespace touched up in block/qcow2-cluster.c; stale commit message paragraph deleted] Signed-off-by: Markus Armbruster --- qga/commands-posix.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'qga/commands-posix.c') diff --git a/qga/commands-posix.c b/qga/commands-posix.c index eaef7be42e..ea37c097cf 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -127,7 +127,6 @@ int64_t qmp_guest_get_time(Error **errp) { int ret; qemu_timeval tq; - int64_t time_ns; ret = qemu_gettimeofday(&tq); if (ret < 0) { @@ -135,8 +134,7 @@ int64_t qmp_guest_get_time(Error **errp) return -1; } - time_ns = tq.tv_sec * 1000000000LL + tq.tv_usec * 1000; - return time_ns; + return tq.tv_sec * 1000000000LL + tq.tv_usec * 1000; } void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) -- cgit v1.2.3-55-g7522