[net-next PATCH v3 09/15] device property: Introduce fwnode_get_id()

[Rafael J. Wysocki]

On Wed, Jan 20, 2021 at 7:51 PM Andy Shevchenko
<andy.shevchenko at gmail.com> wrote:
>
> On Wed, Jan 20, 2021 at 8:18 PM Rafael J. Wysocki <rafael at kernel.org> wrote:
> > On Tue, Jan 12, 2021 at 7:02 PM Andy Shevchenko
> > <andy.shevchenko at gmail.com> wrote:
> > > On Tue, Jan 12, 2021 at 09:30:31AM -0800, Saravana Kannan wrote:
> > > > On Tue, Jan 12, 2021 at 5:42 AM Calvin Johnson
> > > > <calvin.johnson at oss.nxp.com> wrote:
>
> ...
>
> > > > > +       ret = fwnode_property_read_u32(fwnode, "reg", id);
> > > > > +       if (!(ret && is_acpi_node(fwnode)))
> > > > > +               return ret;
> > > > > +
> > > > > +#ifdef CONFIG_ACPI
> > > > > +       status = acpi_evaluate_integer(ACPI_HANDLE_FWNODE(fwnode),
> > > > > +                                      METHOD_NAME__ADR, NULL, &adr);
> > > > > +       if (ACPI_FAILURE(status))
> > > > > +               return -EINVAL;
> > > > > +       *id = (u32)adr;
> > > > > +#endif
> > > > > +       return 0;
>
> > > > Also ACPI and DT
> > > > aren't mutually exclusive if I'm not mistaken.
> > >
> > > That's why we try 'reg' property for both cases first.
> > >
> > > is_acpi_fwnode() conditional is that what I don't like though.
> >
> > I'm not sure what you mean here, care to elaborate?
>
> I meant is_acpi_node(fwnode) in the conditional.
>
> I think it's redundant and we can simple do something like this:
>
>   if (ret) {
> #ifdef ACPI
>     ...
> #else
>     return ret;
> #endif
>   }
>   return 0;
>
> --

Right, that should work.  And I'd prefer it too.