Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DEDB7E for ; Tue, 1 Aug 2023 01:12:48 +0000 (UTC) Received: from out28-121.mail.aliyun.com (out28-121.mail.aliyun.com [115.124.28.121]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F355C10E3; Mon, 31 Jul 2023 18:12:46 -0700 (PDT) X-Alimail-AntiSpam:AC=CONTINUE;BC=0.07465538|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_alarm|0.0922483-0.000575133-0.907177;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047192;MF=sunran001@208suo.com;NM=1;PH=DS;RN=8;RT=8;SR=0;TI=SMTPD_---.U5BYNI3_1690852358; Received: from localhost.localdomain(mailfrom:sunran001@208suo.com fp:SMTPD_---.U5BYNI3_1690852358) by smtp.aliyun-inc.com; Tue, 01 Aug 2023 09:12:41 +0800 From: Ran Sun To: apw@canonical.com, joe@perches.com, alexander.deucher@amd.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Ran Sun Subject: [PATCH] drm/amd/pm: Clean up errors in smu_v11_0.h Date: Tue, 1 Aug 2023 01:12:37 +0000 Message-Id: <20230801011237.3913-1-sunran001@208suo.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Fix the following errors reported by checkpatch: ERROR: that open brace { should be on the previous line ERROR: code indent should use tabs where possible Signed-off-by: Ran Sun --- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 7 +++--- scripts/checkpatch.pl | 23 -------------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h index d466db6f0ad4..1b4e0e4716ea 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h @@ -67,8 +67,7 @@ static const __maybe_unused uint16_t link_width[] = {0, 1, 2, 4, 8, 12, 16}; static const __maybe_unused uint16_t link_speed[] = {25, 50, 80, 160}; static const -struct smu_temperature_range __maybe_unused smu11_thermal_policy[] = -{ +struct smu_temperature_range __maybe_unused smu11_thermal_policy[] = { {-273150, 99000, 99000, -273150, 99000, 99000, -273150, 99000, 99000}, { 120000, 120000, 120000, 120000, 120000, 120000, 120000, 120000, 120000}, }; @@ -96,8 +95,8 @@ struct smu_11_0_dpm_table { }; struct smu_11_0_pcie_table { - uint8_t pcie_gen[MAX_PCIE_CONF]; - uint8_t pcie_lane[MAX_PCIE_CONF]; + uint8_t pcie_gen[MAX_PCIE_CONF]; + uint8_t pcie_lane[MAX_PCIE_CONF]; }; struct smu_11_0_dpm_tables { diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 85a0598bf723..528f619520eb 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -7449,23 +7449,6 @@ sub process { } # Complain about RCU Tasks Trace used outside of BPF (and of course, RCU). -<<<<<<< HEAD -<<<<<<< HEAD - if ($line =~ /\brcu_read_lock_trace\s*\(/ || - $line =~ /\brcu_read_lock_trace_held\s*\(/ || - $line =~ /\brcu_read_unlock_trace\s*\(/ || - $line =~ /\bcall_rcu_tasks_trace\s*\(/ || - $line =~ /\bsynchronize_rcu_tasks_trace\s*\(/ || - $line =~ /\brcu_barrier_tasks_trace\s*\(/ || - $line =~ /\brcu_request_urgent_qs_task\s*\(/) { - if ($realfile !~ m@^kernel/bpf@ && - $realfile !~ m@^include/linux/bpf@ && - $realfile !~ m@^net/bpf@ && - $realfile !~ m@^kernel/rcu@ && - $realfile !~ m@^include/linux/rcu@) { -======= -======= ->>>>>>> d7b3af5a77e8d8da28f435f313e069aea5bcf172 our $rcu_trace_funcs = qr{(?x: rcu_read_lock_trace | rcu_read_lock_trace_held | @@ -7482,14 +7465,8 @@ sub process { kernel/rcu/ | include/linux/rcu )}; -<<<<<<< HEAD - if ($line =~ /\b$rcu_trace_funcs\s*\(/) { - if ($realfile !~ m@^$rcu_trace_paths@) { ->>>>>>> 4d2c646ac07cf4a35ef1c4a935a1a4fd6c6b1a36 -======= if ($line =~ /\b($rcu_trace_funcs)\s*\(/) { if ($realfile !~ m{^$rcu_trace_paths}) { ->>>>>>> d7b3af5a77e8d8da28f435f313e069aea5bcf172 WARN("RCU_TASKS_TRACE", "use of RCU tasks trace is incorrect outside BPF or core RCU code\n" . $herecurr); } -- 2.17.1