From patchwork Tue Nov 8 11:43:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: KaiLong Wang X-Patchwork-Id: 622682 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87DD9C4332F for ; Tue, 8 Nov 2022 11:48:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233876AbiKHLsz (ORCPT ); Tue, 8 Nov 2022 06:48:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233794AbiKHLsy (ORCPT ); Tue, 8 Nov 2022 06:48:54 -0500 Received: from jari.cn (unknown [218.92.28.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 56A7B55BA; Tue, 8 Nov 2022 03:48:53 -0800 (PST) Received: by ajax-webmail-localhost.localdomain (Coremail) ; Tue, 8 Nov 2022 19:43:54 +0800 (GMT+08:00) X-Originating-IP: [182.148.13.29] Date: Tue, 8 Nov 2022 19:43:54 +0800 (GMT+08:00) X-CM-HeaderCharset: UTF-8 From: wangkailong@jari.cn To: Moore , "Rafael J. Wysocki" , Wentland , Li , Siqueira , Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , Airlie , Vetter Cc: linux-acpi@vger.kernel.org, devel@acpica.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] ACPICA: Fix return X-Priority: 3 X-Mailer: Coremail Webmail Server Version XT6.0.1 build 20210329(c53f3fee) Copyright (c) 2002-2022 www.mailtech.cn mispb-4e503810-ca60-4ec8-a188-7102c18937cf-zhkzyfz.cn MIME-Version: 1.0 Message-ID: <7ce6bd54.f8.184570dd1b6.Coremail.wangkailong@jari.cn> X-Coremail-Locale: zh_CN X-CM-TRANSID: AQAAfwCXq+H6QGpj7csBAA--.64W X-CM-SenderInfo: 5zdqwypdlo00nj6mt2flof0/1tbiAQAEB2FEYx0DfAAAsm X-Coremail-Antispam: 1Ur529EdanIXcx71UUUUU7IcSsGvfJ3iIAIbVAYjsxI4VWxJw CS07vEb4IE77IF4wCS07vE1I0E4x80FVAKz4kxMIAIbVAFxVCaYxvI4VCIwcAKzIAtYxBI daVFxhVjvjDU= Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org return is not a function, parentheses are not required Signed-off-by: KaiLong Wang --- drivers/acpi/acpica/evsci.c | 12 +++++------- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 17 +++++++---------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c index 3915ff61412b..63dd2aa2d16a 100644 --- a/drivers/acpi/acpica/evsci.c +++ b/drivers/acpi/acpica/evsci.c @@ -38,9 +38,8 @@ u32 acpi_ev_sci_dispatch(void) /* Are there any host-installed SCI handlers? */ - if (!acpi_gbl_sci_handler_list) { - return (int_status); - } + if (!acpi_gbl_sci_handler_list) + return int_status; flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock); @@ -57,7 +56,7 @@ u32 acpi_ev_sci_dispatch(void) } acpi_os_release_lock(acpi_gbl_gpe_lock, flags); - return (int_status); + return int_status; } /******************************************************************************* @@ -193,9 +192,8 @@ acpi_status acpi_ev_remove_all_sci_handlers(void) acpi_os_remove_interrupt_handler((u32) acpi_gbl_FADT.sci_interrupt, acpi_ev_sci_xrupt_handler); - if (!acpi_gbl_sci_handler_list) { - return (status); - } + if (!acpi_gbl_sci_handler_list) + return status; flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock); diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c index 38d71b5c1f2d..66661a20117b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c @@ -29,7 +29,6 @@ #include "core_types.h" #include "resource.h" #include "ipp.h" -#include "timing_generator.h" #include "dc_dmub_srv.h" #define DC_LOGGER dc->ctx->logger @@ -152,9 +151,8 @@ static void dc_stream_free(struct kref *kref) void dc_stream_release(struct dc_stream_state *stream) { - if (stream != NULL) { + if (stream != NULL) kref_put(&stream->refcount, dc_stream_free); - } } struct dc_stream_state *dc_create_stream_for_sink( @@ -316,11 +314,11 @@ bool dc_stream_set_cursor_attributes( struct dc *dc; bool reset_idle_optimizations = false; - if (NULL == stream) { + if (stream == NULL) { dm_error("DC: dc_stream is NULL!\n"); return false; } - if (NULL == attributes) { + if (attributes == NULL) { dm_error("DC: attributes is NULL!\n"); return false; } @@ -399,12 +397,12 @@ bool dc_stream_set_cursor_position( struct dc *dc = stream->ctx->dc; bool reset_idle_optimizations = false; - if (NULL == stream) { + if (stream == NULL) { dm_error("DC: dc_stream is NULL!\n"); return false; } - if (NULL == position) { + if (position == NULL) { dm_error("DC: cursor position is NULL!\n"); return false; } @@ -468,9 +466,8 @@ bool dc_stream_add_writeback(struct dc *dc, } } - if (!isDrc) { + if (!isDrc) stream->writeback_info[stream->num_wb_info++] = *wb_info; - } if (dc->hwss.enable_writeback) { struct dc_stream_status *stream_status = dc_stream_get_status(stream); @@ -526,7 +523,7 @@ bool dc_stream_remove_writeback(struct dc *dc, /* remove writeback info for disabled writeback pipes from stream */ for (i = 0, j = 0; i < stream->num_wb_info; i++) { if (stream->writeback_info[i].wb_enabled) { - if (j < i) + if (i != j) /* trim the array */ stream->writeback_info[j] = stream->writeback_info[i]; j++;