Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230801011237.3913-1-sunran001@208suo.com>
In-Reply-To: <20230801011237.3913-1-sunran001@208suo.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Mon, 7 Aug 2023 12:17:06 -0400
Message-ID: <CADnq5_NDLqDPU5n2yLJdp+OAUnnu4LW=uU4HXji0R1usJebtHQ@mail.gmail.com>
Subject: Re: [PATCH] drm/amd/pm: Clean up errors in smu_v11_0.h
To:     Ran Sun <sunran001@208suo.com>
Cc:     apw@canonical.com, joe@perches.com, alexander.deucher@amd.com,
        bpf@vger.kernel.org, dri-devel@lists.freedesktop.org,
        amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied with the garbage hunks dropped.

Alex


On Mon, Jul 31, 2023 at 9:12=E2=80=AFPM Ran Sun <sunran001@208suo.com> wrot=
e:
>
> 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@208suo.com>
> ---
>  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/d=
rm/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[] =3D {=
0, 1, 2, 4, 8, 12, 16};
>  static const __maybe_unused uint16_t link_speed[] =3D {25, 50, 80, 160};
>
>  static const
> -struct smu_temperature_range __maybe_unused smu11_thermal_policy[] =3D
> -{
> +struct smu_temperature_range __maybe_unused smu11_thermal_policy[] =3D {
>         {-273150,  99000, 99000, -273150, 99000, 99000, -273150, 99000, 9=
9000},
>         { 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 =3D~ /\brcu_read_lock_trace\s*\(/ ||
> -                   $line =3D~ /\brcu_read_lock_trace_held\s*\(/ ||
> -                   $line =3D~ /\brcu_read_unlock_trace\s*\(/ ||
> -                   $line =3D~ /\bcall_rcu_tasks_trace\s*\(/ ||
> -                   $line =3D~ /\bsynchronize_rcu_tasks_trace\s*\(/ ||
> -                   $line =3D~ /\brcu_barrier_tasks_trace\s*\(/ ||
> -                   $line =3D~ /\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@) {
> -=3D=3D=3D=3D=3D=3D=3D
> -=3D=3D=3D=3D=3D=3D=3D
> ->>>>>>> d7b3af5a77e8d8da28f435f313e069aea5bcf172
>                 our $rcu_trace_funcs =3D 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 =3D~ /\b$rcu_trace_funcs\s*\(/) {
> -                       if ($realfile !~ m@^$rcu_trace_paths@) {
> ->>>>>>> 4d2c646ac07cf4a35ef1c4a935a1a4fd6c6b1a36
> -=3D=3D=3D=3D=3D=3D=3D
>                 if ($line =3D~ /\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
>