From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com ([119.145.14.65]:38683 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750862AbbCTBTA (ORCPT ); Thu, 19 Mar 2015 21:19:00 -0400 Message-ID: <550B757A.4090502@huawei.com> Date: Fri, 20 Mar 2015 09:18:50 +0800 From: Yijing Wang MIME-Version: 1.0 To: Bjorn Helgaas CC: Rob Herring , , Subject: Re: [PATCH] PCI: versatile: Fix building error for resource_list_for_each_entry References: <1426475463-11352-1-git-send-email-wangyijing@huawei.com> <20150319155920.GG26935@google.com> In-Reply-To: <20150319155920.GG26935@google.com> Content-Type: text/plain; charset="ISO-8859-1" Sender: linux-pci-owner@vger.kernel.org List-ID: 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 >> --- >> 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 >> #include >> #include >> +#include >> >> 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 > > -- Thanks! Yijing