| Message ID | 20140908044014.GC2464@pratyush-vbox (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Sun, Sep 7, 2014 at 10:40 PM, Pratyush Anand <pratyush.anand@st.com> wrote: > On Sat, Sep 06, 2014 at 08:03:29AM +0800, Bjorn Helgaas wrote: >> On Sat, Aug 16, 2014 at 12:52:39PM +0530, Pratyush Anand wrote: >> > struct pcie_port_info elements are not containing any exclusive >> > information compared to other elements of struct pcie_port. So, keeping >> > a separate structure like struct pcie_port_info does not seem very >> > logical. Therefore remove this struct and embed its elements directly >> > into struct pcie_port. >> > >> > Signed-off-by: Pratyush Anand <pratyush.anand@st.com> >> >> Applied with Mohit's ack to pci/host-designware for v3.18, thanks! >> >> I had to resolve some merge conflicts, so look it over and make sure I >> did it correctly. > > Following diff need to be merged with the commit. > Let me know if I need to resend this patch rebased on top of > pci/host-designware ~ 1. > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index 04a71093bf9a..5d720c21fdc0 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -520,7 +520,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > } > > if (!pp->va_cfg1_base) { > - pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; > + pp->cfg1_base = pp->cfg.start + pp->cfg0_size; > pp->va_cfg1_base = devm_ioremap(pp->dev, pp->cfg1_base, > pp->cfg1_size); > if (!pp->va_cfg1_base) { > > I updated pci/host-designware with this fix, thanks! Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 04a71093bf9a..5d720c21fdc0 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -520,7 +520,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp) } if (!pp->va_cfg1_base) { - pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; + pp->cfg1_base = pp->cfg.start + pp->cfg0_size; pp->va_cfg1_base = devm_ioremap(pp->dev, pp->cfg1_base, pp->cfg1_size); if (!pp->va_cfg1_base) {