Re: [PATCH] pci: bus: only call of_platform_populate() if CONFIG_OF is defined

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, Jul 6, 2024 at 10:43 AM Lukas Wunner <lukas@xxxxxxxxx> wrote:
>
> On Wed, Jul 03, 2024 at 11:32:05AM +0200, Bartosz Golaszewski wrote:
> > On Wed, Jul 3, 2024 at 11:15 AM Bert Karwatzki <spasswolf@xxxxxx> wrote:
> > > If of_platform_populate() is called when CONFIG_OF is not defined this
> > > leads to spurious error messages of the following type:
> > >  pci 0000:00:01.1: failed to populate child OF nodes (-19)
> > >  pci 0000:00:02.1: failed to populate child OF nodes (-19)
> > >
> > > Fixes: 8fb18619d910 ("PCI/pwrctl: Create platform devices for child OF nodes of the port node")
> > > Signed-off-by: Bert Karwatzki <spasswolf@xxxxxx>
> > > ---
> > >  drivers/pci/bus.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > >
> > > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
> > > index e4735428814d..b363010664cd 100644
> > > --- a/drivers/pci/bus.c
> > > +++ b/drivers/pci/bus.c
> > > @@ -350,6 +350,7 @@ void pci_bus_add_device(struct pci_dev *dev)
> > >
> > >         pci_dev_assign_added(dev, true);
> > >
> > > +#ifdef CONFIG_OF
> > >         if (pci_is_bridge(dev)) {
>
> Per section 21 of Documentation/process/coding-style.rst,
> IS_ENABLED() is strongly preferred to #ifdef.
>
>
> > There's a better (less ifdeffery) fix on the list that I'll pick up
> > later today[1].
> >
> > [1] https://lore.kernel.org/lkml/20240702180839.71491-1-superm1@xxxxxxxxxx/T/
>
> That other fix doesn't feel very robust as it depends on
> of_platform_populate() never returning -ENODEV in the
> CONFIG_OF=y case.
>

If we even have to play these ifdef games then the stubs for
of_platform_populate() are broken and should probably return 0 with
!OF as otherwise the stubs themselves are useless.

Bart





[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux