From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <50ED9688.9090304@gmail.com> Date: Thu, 10 Jan 2013 00:10:48 +0800 From: Jiang Liu MIME-Version: 1.0 To: "Rafael J. Wysocki" CC: Bjorn Helgaas , Jiang Liu , Yijing Wang , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Yinghai Lu Subject: Re: [PATCH v3 2/6] PCI: split registration of PCI bus devices into two stages References: <1357663945-16054-1-git-send-email-jiang.liu@huawei.com> <1357663945-16054-3-git-send-email-jiang.liu@huawei.com> <31602902.kR8ehd6tSR@vostro.rjw.lan> In-Reply-To: <31602902.kR8ehd6tSR@vostro.rjw.lan> Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: On 01/09/2013 07:29 AM, Rafael J. Wysocki wrote: > On Wednesday, January 09, 2013 12:52:21 AM Jiang Liu wrote: snip >> @@ -1678,7 +1679,8 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, >> b->dev.class = &pcibus_class; >> b->dev.parent = b->bridge; >> dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), bus); >> - error = device_register(&b->dev); >> + device_initialize(&b->dev); >> + error = device_add(&b->dev); > > Well, the change here isn't really necessary, as far as I can say. Hi Rafael, The kernel documentation recommends to pair device_add() with device_del(), so the above change is to follow that recommendation because pci_remove_bus() now invokes device_del(). > >> if (error) >> goto class_dev_reg_err; >> >> diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c >> index fc38c48..a1fdd0f 100644 >> --- a/drivers/pci/remove.c >> +++ b/drivers/pci/remove.c >> @@ -48,11 +48,11 @@ void pci_remove_bus(struct pci_bus *bus) >> list_del(&bus->node); >> pci_bus_release_busn_res(bus); >> up_write(&pci_bus_sem); >> - if (!bus->is_added) >> - return; >> - >> - pci_remove_legacy_files(bus); >> - device_unregister(&bus->dev); >> + if (bus->is_added) { >> + pci_remove_legacy_files(bus); >> + device_del(&bus->dev); >> + } >> + put_device(&bus->dev); >> } >> EXPORT_SYMBOL(pci_remove_bus); >> >> > > Apart from the above > > Acked-by: Rafael J. Wysocki Thanks for your review and Ack. Regards! Gerry