diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2016-06-13 18:57:58 -0300 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-06-20 16:38:13 +0200 |
| commit | 9be385980d37e8f4fd33f605f5fb1c3d144170a8 (patch) | |
| tree | d4516d2305c01fabda776667acdb48c48cb105af /hw/acpi/aml-build.c | |
| parent | 6b62d961373e0327f2af8fb77d6d5d6308864180 (diff) | |
| download | qemu-9be385980d37e8f4fd33f605f5fb1c3d144170a8.tar.gz | |
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 <eblake@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1465855078-19435-4-git-send-email-ehabkost@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[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 <armbru@redhat.com>
Diffstat (limited to 'hw/acpi/aml-build.c')
| -rw-r--r-- | hw/acpi/aml-build.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 123160a94e..874e473cac 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -324,12 +324,9 @@ static void aml_free(gpointer data, gpointer user_data) Aml *init_aml_allocator(void) { - Aml *var; - assert(!alloc_list); alloc_list = g_ptr_array_new(); - var = aml_alloc(); - return var; + return aml_alloc(); } void free_aml_allocator(void) @@ -451,12 +448,10 @@ Aml *aml_name_decl(const char *name, Aml *val) /* ACPI 1.0b: 16.2.6.1 Arg Objects Encoding */ Aml *aml_arg(int pos) { - Aml *var; uint8_t op = 0x68 /* ARG0 op */ + pos; assert(pos <= 6); - var = aml_opcode(op); - return var; + return aml_opcode(op); } /* ACPI 2.0a: 17.2.4.4 Type 2 Opcodes Encoding: DefToInteger */ @@ -1082,12 +1077,10 @@ Aml *aml_string(const char *name_format, ...) /* ACPI 1.0b: 16.2.6.2 Local Objects Encoding */ Aml *aml_local(int num) { - Aml *var; uint8_t op = 0x60 /* Local0Op */ + num; assert(num <= 7); - var = aml_opcode(op); - return var; + return aml_opcode(op); } /* ACPI 2.0a: 17.2.2 Data Objects Encoding: DefVarPackage */ |