Re: [PATCH v3 3/5] PCI: dwc: Free MSI in the error code path of dw_pcie_host_init()

[Jisheng Zhang]

On Thu, 28 Mar 2019 17:08:43 +0000 Robin Murphy wrote:

> 
> 
> On 18/03/2019 09:56, Jisheng Zhang wrote:
> > If we ever did some msi related initializations, we need to call
> > dw_pcie_free_msi() in the error code path.
> >
> > Signed-off-by: Jisheng Zhang <Jisheng.Zhang@xxxxxxxxxxxxx>
> > Acked-by: Gustavo Pimentel <gustavo.pimentel@xxxxxxxxxxxx>
> > ---
> >   drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++++--
> >   1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
> > index a71b874ae3c0..585080699675 100644
> > --- a/drivers/pci/controller/dwc/pcie-designware-host.c
> > +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
> > @@ -483,7 +483,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
> >       if (pp->ops->host_init) {
> >               ret = pp->ops->host_init(pp);
> >               if (ret)
> > -                     goto error;
> > +                     goto err_free_msi;
> >       }
> >
> >       pp->root_bus_nr = pp->busn->start;
> > @@ -497,7 +497,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
> >
> >       ret = pci_scan_root_bus_bridge(bridge);
> >       if (ret)
> > -             goto error;
> > +             goto err_free_msi;
> >
> >       bus = bridge->bus;
> >
> > @@ -513,6 +513,10 @@ int dw_pcie_host_init(struct pcie_port *pp)
> >       pci_bus_add_devices(bus);
> >       return 0;
> >
> > +err_free_msi:
> > +     if (IS_ENABLED(CONFIG_PCI_MSI) && pci_msi_enabled() &&  
> 
> pci_msi_enabled() already has a stub for !CONFIG_PCI_MSI, so you
> shouldn't need an explicit IS_ENABLED() here.

Indeed, thanks very much. updated in V4

Thanks