Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
MIME-Version: 1.0
References: <20230827023932.501102-1-sergio.paracuellos@gmail.com>
In-Reply-To: <20230827023932.501102-1-sergio.paracuellos@gmail.com>
From:   Sergio Paracuellos <sergio.paracuellos@gmail.com>
Date:   Sat, 7 Oct 2023 09:20:12 +0200
Message-ID: <CAMhs-H87Fze_7eN-odMFFSquT=aQeJjrYVsUM68_eAnzePo9gw@mail.gmail.com>
Subject: Re: [PATCH v2] clk: ralink: mtmips: quiet unused variable warning
To:     linux-clk@vger.kernel.org
Cc:     tsbogend@alpha.franken.de, sboyd@kernel.org,
        mturquette@baylibre.com, linux-kernel@vger.kernel.org,
        ndesaulniers@google.com, arnd@kernel.org, yangshiji66@outlook.com,
        kernel test robot <lkp@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sun, Aug 27, 2023 at 4:39=E2=80=AFAM Sergio Paracuellos
<sergio.paracuellos@gmail.com> wrote:
>
> When CONFIG_OF is disabled then the matching table is not referenced and
> the following warning appears:
>
> drivers/clk/ralink/clk-mtmips.c:821:34: warning: unused variable 'mtmips_=
of_match' [-Wunused-const-variable]
> 821 |   static const struct of_device_id mtmips_of_match[] =3D {
>     |                          ^
>
> There are two match tables in the driver: one for the clock driver and th=
e
> other for the reset driver. The only difference between them is that the
> clock driver uses 'data' and does not have 'ralink,rt2880-reset' compatib=
le.
> Both just can be merged into a single one just by adding the compatible
> 'ralink,rt2880-reset' entry to 'mtmips_of_match[]', which will allow it t=
o
> be used for 'mtmips_clk_driver' (which doesn't use the data) as well as f=
or
> 'mtmips_clk_init()' (which doesn't need get called for 'ralink,rt2880-res=
et').
>
> Doing in this way ensures that 'CONFIG_OF' is not disabled anymore so the
> above warning disapears.
>
> Fixes: 6f3b15586eef ("clk: ralink: add clock and reset driver for MTMIPS =
SoCs")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202307242310.CdOnd2py-lkp@i=
ntel.com/
> Suggested-by: Arnd Bergmann <arnd@kernel.org>
> Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
> ---
> Changes in v2:
> - Merge two match tables into one to properly avoid this warning.
>
> PATCH in v1: https://lore.kernel.org/lkml/20230802092647.3000666-1-sergio=
.paracuellos@gmail.com/T/
>
>  drivers/clk/ralink/clk-mtmips.c | 20 +++++---------------
>  1 file changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/clk/ralink/clk-mtmips.c b/drivers/clk/ralink/clk-mtm=
ips.c
> index 1e7991439527..50a443bf79ec 100644
> --- a/drivers/clk/ralink/clk-mtmips.c
> +++ b/drivers/clk/ralink/clk-mtmips.c
> @@ -821,6 +821,10 @@ static const struct mtmips_clk_data mt76x8_clk_data =
=3D {
>  };
>
>  static const struct of_device_id mtmips_of_match[] =3D {
> +       {
> +               .compatible =3D "ralink,rt2880-reset",
> +               .data =3D NULL,
> +       },
>         {
>                 .compatible =3D "ralink,rt2880-sysc",
>                 .data =3D &rt2880_clk_data,
> @@ -1088,25 +1092,11 @@ static int mtmips_clk_probe(struct platform_devic=
e *pdev)
>         return 0;
>  }
>
> -static const struct of_device_id mtmips_clk_of_match[] =3D {
> -       { .compatible =3D "ralink,rt2880-reset" },
> -       { .compatible =3D "ralink,rt2880-sysc" },
> -       { .compatible =3D "ralink,rt3050-sysc" },
> -       { .compatible =3D "ralink,rt3052-sysc" },
> -       { .compatible =3D "ralink,rt3352-sysc" },
> -       { .compatible =3D "ralink,rt3883-sysc" },
> -       { .compatible =3D "ralink,rt5350-sysc" },
> -       { .compatible =3D "ralink,mt7620-sysc" },
> -       { .compatible =3D "ralink,mt7628-sysc" },
> -       { .compatible =3D "ralink,mt7688-sysc" },
> -       {}
> -};
> -
>  static struct platform_driver mtmips_clk_driver =3D {
>         .probe =3D mtmips_clk_probe,
>         .driver =3D {
>                 .name =3D "mtmips-clk",
> -               .of_match_table =3D mtmips_clk_of_match,
> +               .of_match_table =3D mtmips_of_match,
>         },
>  };
>
> --
> 2.25.1
>

Gentle ping for this patch.

Thanks,
    Sergio Paracuellos