Applied with the garbage hunks dropped. Alex On Mon, Jul 31, 2023 at 9:12 PM Ran Sun <sunran001@xxxxxxxxxx> wrote: > > 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 <sunran001@xxxxxxxxxx> > --- > 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 >