| Message ID | 1426475463-11352-1-git-send-email-wangyijing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, Mar 16, 2015 at 11:11:03AM +0800, Yijing Wang wrote: > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > --- > drivers/pci/host/pci-versatile.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c > index e3a2450..4352ee9 100644 > --- a/drivers/pci/host/pci-versatile.c > +++ b/drivers/pci/host/pci-versatile.c > @@ -22,6 +22,7 @@ > #include <linux/of_platform.h> > #include <linux/pci.h> > #include <linux/platform_device.h> > +#include <linux/resource_ext.h> > > static void __iomem *versatile_pci_base; > static void __iomem *versatile_cfg_base[2]; > @@ -80,7 +81,7 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev, > if (err) > return err; > > - resource_list_for_each_entry(win, res, list) { > + resource_list_for_each_entry(win, res) { This fix appeared in v4.0-rc3 as f1651a242809 ("PCI: versatile: Update for list_for_each_entry() API change"). Rafael merged it through his tree because I think the problem happened in 872912352c5b ("Merge tag 'pm+acpi-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") where the conflict resolution changed list_for_each_entry() to resource_list_for_each_entry() but forgot to drop the extra parameter. I rebased my "next" branch to v4.0-rc4, which picks up that fix. > struct resource *parent, *res = win->res; > > switch (resource_type(res)) { > -- > 1.7.1 > > -- > 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 -- 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
On 2015/3/19 23:59, Bjorn Helgaas wrote: > On Mon, Mar 16, 2015 at 11:11:03AM +0800, Yijing Wang wrote: >> Signed-off-by: Yijing Wang <wangyijing@huawei.com> >> --- >> drivers/pci/host/pci-versatile.c | 3 ++- >> 1 files changed, 2 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c >> index e3a2450..4352ee9 100644 >> --- a/drivers/pci/host/pci-versatile.c >> +++ b/drivers/pci/host/pci-versatile.c >> @@ -22,6 +22,7 @@ >> #include <linux/of_platform.h> >> #include <linux/pci.h> >> #include <linux/platform_device.h> >> +#include <linux/resource_ext.h> >> >> static void __iomem *versatile_pci_base; >> static void __iomem *versatile_cfg_base[2]; >> @@ -80,7 +81,7 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev, >> if (err) >> return err; >> >> - resource_list_for_each_entry(win, res, list) { >> + resource_list_for_each_entry(win, res) { > > This fix appeared in v4.0-rc3 as f1651a242809 ("PCI: versatile: Update for > list_for_each_entry() API change"). > > Rafael merged it through his tree because I think the problem happened in > 872912352c5b ("Merge tag 'pm+acpi-3.20-rc1' of > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") where the > conflict resolution changed list_for_each_entry() to > resource_list_for_each_entry() but forgot to drop the extra parameter. > > I rebased my "next" branch to v4.0-rc4, which picks up that fix. OK, thanks! > > >> struct resource *parent, *res = win->res; >> >> switch (resource_type(res)) { >> -- >> 1.7.1 >> >> -- >> 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/pci-versatile.c b/drivers/pci/host/pci-versatile.c index e3a2450..4352ee9 100644 --- a/drivers/pci/host/pci-versatile.c +++ b/drivers/pci/host/pci-versatile.c @@ -22,6 +22,7 @@ #include <linux/of_platform.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/resource_ext.h> static void __iomem *versatile_pci_base; static void __iomem *versatile_cfg_base[2]; @@ -80,7 +81,7 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev, if (err) return err; - resource_list_for_each_entry(win, res, list) { + resource_list_for_each_entry(win, res) { struct resource *parent, *res = win->res; switch (resource_type(res)) {
Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/pci/host/pci-versatile.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)