This patch removes unnecessary parentheses around return values and curly braces from single-statement conditionals. Curly braces are removed only from conditionals that are directly related to the return statements being cleaned up. Other instances of one-line conditionals remain unchanged to limit the scope of this patch. These changes address checkpatch.pl warnings and improve code readability. v3: - Updated commit message v2: - Addressed review comments - Updated commit message Signed-off-by: Diksha Kumari <dikshakdevgan@xxxxxxxxx> --- drivers/acpi/acpica/dbconvert.c | 43 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/drivers/acpi/acpica/dbconvert.c b/drivers/acpi/acpica/dbconvert.c index 8dbab6932049..5f53388b6f1e 100644 --- a/drivers/acpi/acpica/dbconvert.c +++ b/drivers/acpi/acpica/dbconvert.c @@ -31,9 +31,8 @@ acpi_status acpi_db_hex_char_to_value(int hex_char, u8 *return_value) /* Digit must be ascii [0-9a-fA-F] */ - if (!isxdigit(hex_char)) { - return (AE_BAD_HEX_CONSTANT); - } + if (!isxdigit(hex_char)) + return AE_BAD_HEX_CONSTANT; if (hex_char <= 0x39) { value = (u8)(hex_char - 0x30); @@ -42,7 +41,7 @@ acpi_status acpi_db_hex_char_to_value(int hex_char, u8 *return_value) } *return_value = value; - return (AE_OK); + return AE_OK; } /******************************************************************************* @@ -68,19 +67,17 @@ static acpi_status acpi_db_hex_byte_to_binary(char *hex_byte, u8 *return_value) /* High byte */ status = acpi_db_hex_char_to_value(hex_byte[0], &local0); - if (ACPI_FAILURE(status)) { - return (status); - } + if (ACPI_FAILURE(status)) + return status; /* Low byte */ status = acpi_db_hex_char_to_value(hex_byte[1], &local1); - if (ACPI_FAILURE(status)) { - return (status); - } + if (ACPI_FAILURE(status)) + return status; *return_value = (u8)((local0 << 4) | local1); - return (AE_OK); + return AE_OK; } /******************************************************************************* @@ -122,9 +119,8 @@ acpi_db_convert_to_buffer(char *string, union acpi_object *object) } buffer = ACPI_ALLOCATE(length); - if (!buffer) { - return (AE_NO_MEMORY); - } + if (!buffer) + return AE_NO_MEMORY; /* Convert the command line bytes to the buffer */ @@ -132,7 +128,7 @@ acpi_db_convert_to_buffer(char *string, union acpi_object *object) status = acpi_db_hex_byte_to_binary(&string[i], &buffer[j]); if (ACPI_FAILURE(status)) { ACPI_FREE(buffer); - return (status); + return status; } j++; @@ -145,7 +141,7 @@ acpi_db_convert_to_buffer(char *string, union acpi_object *object) object->type = ACPI_TYPE_BUFFER; object->buffer.pointer = buffer; object->buffer.length = length; - return (AE_OK); + return AE_OK; } /******************************************************************************* @@ -175,7 +171,7 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object) ACPI_ALLOCATE_ZEROED(DB_DEFAULT_PKG_ELEMENTS * sizeof(union acpi_object)); if (!elements) - return (AE_NO_MEMORY); + return AE_NO_MEMORY; this = string; for (i = 0; i < (DB_DEFAULT_PKG_ELEMENTS - 1); i++) { @@ -190,7 +186,7 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object) if (ACPI_FAILURE(status)) { acpi_db_delete_objects(i + 1, elements); ACPI_FREE(elements); - return (status); + return status; } this = next; @@ -199,7 +195,7 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object) object->type = ACPI_TYPE_PACKAGE; object->package.count = i; object->package.elements = elements; - return (AE_OK); + return AE_OK; } /******************************************************************************* @@ -251,7 +247,7 @@ acpi_db_convert_to_object(acpi_object_type type, break; } - return (status); + return status; } /******************************************************************************* @@ -272,9 +268,8 @@ u8 *acpi_db_encode_pld_buffer(struct acpi_pld_info *pld_info) u32 dword; buffer = ACPI_ALLOCATE_ZEROED(ACPI_PLD_BUFFER_SIZE); - if (!buffer) { - return (NULL); - } + if (!buffer) + return NULL; /* First 32 bits */ @@ -331,7 +326,7 @@ u8 *acpi_db_encode_pld_buffer(struct acpi_pld_info *pld_info) ACPI_MOVE_32_TO_32(&buffer[4], &dword); } - return (ACPI_CAST_PTR(u8, buffer)); + return ACPI_CAST_PTR(u8, buffer); } /******************************************************************************* -- 2.34.1