On 2014/2/14 7:54, Rafael J. Wysocki wrote: > On Thursday, February 13, 2014 09:13:58 PM Yijing Wang wrote: >> Replace list_for_each() + pci_bus_b() with the simpler >> list_for_each_entry(). >> >> Signed-off-by: Yijing Wang <wangyijing at huawei.com> > > Looks reasonable to me. > > Does it conflict with anything currently in linux-next (the linux-next branch > of linux-pm.git in particular)?
Hi Rafael, I applied this to your linux-next branch successfully . No conflicts found. Thanks! Yijing. > >> --- >> drivers/pci/hotplug/acpiphp_glue.c | 6 +++--- >> 1 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/pci/hotplug/acpiphp_glue.c >> b/drivers/pci/hotplug/acpiphp_glue.c >> index cd929ae..aee6a0a 100644 >> --- a/drivers/pci/hotplug/acpiphp_glue.c >> +++ b/drivers/pci/hotplug/acpiphp_glue.c >> @@ -450,7 +450,7 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge) >> */ >> static unsigned char acpiphp_max_busnr(struct pci_bus *bus) >> { >> - struct list_head *tmp; >> + struct pci_bus *tmp; >> unsigned char max, n; >> >> /* >> @@ -463,8 +463,8 @@ static unsigned char acpiphp_max_busnr(struct pci_bus >> *bus) >> */ >> max = bus->busn_res.start; >> >> - list_for_each(tmp, &bus->children) { >> - n = pci_bus_max_busnr(pci_bus_b(tmp)); >> + list_for_each_entry(tmp, &bus->children, node) { >> + n = pci_bus_max_busnr(tmp); >> if (n > max) >> max = n; >> } >> > -- Thanks! Yijing