Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190612010011.90185-1-wangkefeng.wang@huawei.com> <0702fa2d-1952-e9fc-8e17-a93f3b90a958@gmail.com>
In-Reply-To: <0702fa2d-1952-e9fc-8e17-a93f3b90a958@gmail.com>
From:   Rob Herring <robh@kernel.org>
Date:   Wed, 12 Jun 2019 11:00:08 -0600
Message-ID: <CAL_JsqKsjK237W+-Yz4McxSZG=Gd3Pfp2JtgMnfAqiNRUcCg1g@mail.gmail.com>
Subject: Re: [PATCH next] of/fdt: Fix defined but not used compiler warning
To:     Frank Rowand <frowand.list@gmail.com>
Cc:     Kefeng Wang <wangkefeng.wang@huawei.com>,
        devicetree@vger.kernel.org,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Stephen Boyd <swboyd@chromium.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, Jun 12, 2019 at 10:45 AM Frank Rowand <frowand.list@gmail.com> wrot=
e:
>
> Hi Kefeng,
>
> If Rob agrees, I'd like to see one more change in this patch.
>
> Since the only caller of of_fdt_match() is of_flat_dt_match(),
> can you move the body of of_fdt_match() into  of_flat_dt_match()
> and eliminate of_fdt_match()?

That's fine as long as we think there's never any use for of_fdt_match
after init? Fixup of nodes in an overlay for example.

Rob

>
> (Noting that of_flat_dt_match() consists only of the call to
> of_fdt_match().)
>
> -Frank
>
>
> On 6/11/19 6:00 PM, Kefeng Wang wrote:
> > When CONFIG_OF_EARLY_FLATTREE is disabled, there is a compiler warning,
> >
> > drivers/of/fdt.c:129:19: warning: =E2=80=98of_fdt_match=E2=80=99 define=
d but not used [-Wunused-function]
> >  static int __init of_fdt_match(const void *blob, unsigned long node,
> >
> > Move of_fdt_match() and of_fdt_is_compatible() under CONFIG_OF_EARLY_FL=
ATTREE
> > to fix it.
> >
> > Cc: Stephen Boyd <swboyd@chromium.org>
> > Cc: Rob Herring <robh@kernel.org>
> > Cc: Frank Rowand <frowand.list@gmail.com>
> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> > ---
> >  drivers/of/fdt.c | 106 +++++++++++++++++++++++------------------------
> >  1 file changed, 53 insertions(+), 53 deletions(-)
> >
> > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> > index 3d36b5afd9bd..d6afd5b22940 100644
> > --- a/drivers/of/fdt.c
> > +++ b/drivers/of/fdt.c
> > @@ -78,38 +78,6 @@ void __init of_fdt_limit_memory(int limit)
> >       }
> >  }
> >
> > -/**
> > - * of_fdt_is_compatible - Return true if given node from the given blo=
b has
> > - * compat in its compatible list
> > - * @blob: A device tree blob
> > - * @node: node to test
> > - * @compat: compatible string to compare with compatible list.
> > - *
> > - * On match, returns a non-zero value with smaller values returned for=
 more
> > - * specific compatible values.
> > - */
> > -static int of_fdt_is_compatible(const void *blob,
> > -                   unsigned long node, const char *compat)
> > -{
> > -     const char *cp;
> > -     int cplen;
> > -     unsigned long l, score =3D 0;
> > -
> > -     cp =3D fdt_getprop(blob, node, "compatible", &cplen);
> > -     if (cp =3D=3D NULL)
> > -             return 0;
> > -     while (cplen > 0) {
> > -             score++;
> > -             if (of_compat_cmp(cp, compat, strlen(compat)) =3D=3D 0)
> > -                     return score;
> > -             l =3D strlen(cp) + 1;
> > -             cp +=3D l;
> > -             cplen -=3D l;
> > -     }
> > -
> > -     return 0;
> > -}
> > -
> >  static bool of_fdt_device_is_available(const void *blob, unsigned long=
 node)
> >  {
> >       const char *status =3D fdt_getprop(blob, node, "status", NULL);
> > @@ -123,27 +91,6 @@ static bool of_fdt_device_is_available(const void *=
blob, unsigned long node)
> >       return false;
> >  }
> >
> > -/**
> > - * of_fdt_match - Return true if node matches a list of compatible val=
ues
> > - */
> > -static int __init of_fdt_match(const void *blob, unsigned long node,> =
-                             const char *const *compat)
> > -{
> > -     unsigned int tmp, score =3D 0;
> > -
> > -     if (!compat)
> > -             return 0;
> > -
> > -     while (*compat) {
> > -             tmp =3D of_fdt_is_compatible(blob, node, *compat);
> > -             if (tmp && (score =3D=3D 0 || (tmp < score)))
> > -                     score =3D tmp;
> > -             compat++;
> > -     }
> > -
> > -     return score;
> > -}
> > -
> >  static void *unflatten_dt_alloc(void **mem, unsigned long size,
> >                                      unsigned long align)
> >  {
> > @@ -764,6 +711,59 @@ const void *__init of_get_flat_dt_prop(unsigned lo=
ng node, const char *name,
> >       return fdt_getprop(initial_boot_params, node, name, size);
> >  }
> >
> > +/**
> > + * of_fdt_is_compatible - Return true if given node from the given blo=
b has
> > + * compat in its compatible list
> > + * @blob: A device tree blob
> > + * @node: node to test
> > + * @compat: compatible string to compare with compatible list.
> > + *
> > + * On match, returns a non-zero value with smaller values returned for=
 more
> > + * specific compatible values.
> > + */
> > +static int of_fdt_is_compatible(const void *blob,
> > +                   unsigned long node, const char *compat)
> > +{
> > +     const char *cp;
> > +     int cplen;
> > +     unsigned long l, score =3D 0;
> > +
> > +     cp =3D fdt_getprop(blob, node, "compatible", &cplen);
> > +     if (cp =3D=3D NULL)
> > +             return 0;
> > +     while (cplen > 0) {
> > +             score++;
> > +             if (of_compat_cmp(cp, compat, strlen(compat)) =3D=3D 0)
> > +                     return score;
> > +             l =3D strlen(cp) + 1;
> > +             cp +=3D l;
> > +             cplen -=3D l;
> > +     }
> > +
> > +     return 0;
> > +}
> > +
> > +/**
> > + * of_fdt_match - Return true if node matches a list of compatible val=
ues
> > + */
> > +static int __init of_fdt_match(const void *blob, unsigned long node,
> > +                            const char *const *compat)
> > +{
> > +     unsigned int tmp, score =3D 0;
> > +
> > +     if (!compat)
> > +             return 0;
> > +
> > +     while (*compat) {
> > +             tmp =3D of_fdt_is_compatible(blob, node, *compat);
> > +             if (tmp && (score =3D=3D 0 || (tmp < score)))
> > +                     score =3D tmp;
> > +             compat++;
> > +     }
> > +
> > +     return score;
> > +}
> > +
> >  /**
> >   * of_flat_dt_is_compatible - Return true if given node has compat in =
compatible list
> >   * @node: node to test
> >
>