Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755456Ab2FNJSu (ORCPT ); Thu, 14 Jun 2012 05:18:50 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:50803 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755400Ab2FNJSs (ORCPT ); Thu, 14 Jun 2012 05:18:48 -0400 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.5.1 Date: Thu, 14 Jun 2012 18:18:44 +0900 From: Taku Izumi To: Jiang Liu Cc: Bjorn Helgaas , Yinghai Lu , Kenji Kaneshige , Jiang Liu , Don Dutile , Greg KH , Yijing Wang , Keping Chen , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH v1 1/6] PCI: change PCI device management logic to better follow device model Message-Id: <20120614181844.760bc0c7.izumi.taku@jp.fujitsu.com> In-Reply-To: <1338787022-400-1-git-send-email-jiang.liu@huawei.com> References: <1338787022-400-1-git-send-email-jiang.liu@huawei.com> X-Mailer: Sylpheed 3.1.1 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2467 Lines: 89 Hi Jiang, Looks good for me. Best regards, Taku Izumi On Mon, 04 Jun 2012 13:16:57 +0800 Jiang Liu wrote: > From: Jiang Liu > > According to device model documentation, the way to add/remove device > object should be symmetric. > > /** > * device_del - delete device from system. > * @dev: device. > * > * This is the first part of the device unregistration > * sequence. This removes the device from the lists we control > * from here, has it removed from the other driver model > * subsystems it was added to in device_add(), and removes it > * from the kobject hierarchy. > * > * NOTE: this should be called manually _iff_ device_add() was > * also called manually. > */ > > The rule here is to either use > 1) device_register()/device_unregister() > or > 2) device_initialize()/device_add()/device_del()/put_device(). > > So change PCI core to follow the rule and get rid of the redundant > pci_dev_get()/pci_dev_put() pair. > > Signed-off-by: Jiang Liu > --- > drivers/pci/probe.c | 1 - > drivers/pci/remove.c | 4 ++-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 0840409..dacca26 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -1294,7 +1294,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) > { > device_initialize(&dev->dev); > dev->dev.release = pci_release_dev; > - pci_dev_get(dev); > > dev->dev.dma_mask = &dev->dma_mask; > dev->dev.dma_parms = &dev->dma_parms; > diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c > index 04a4861..6c07bc5 100644 > --- a/drivers/pci/remove.c > +++ b/drivers/pci/remove.c > @@ -22,7 +22,7 @@ static void pci_stop_dev(struct pci_dev *dev) > if (dev->is_added) { > pci_proc_detach_device(dev); > pci_remove_sysfs_dev_files(dev); > - device_unregister(&dev->dev); > + device_del(&dev->dev); > dev->is_added = 0; > } > > @@ -40,7 +40,7 @@ static void pci_destroy_dev(struct pci_dev *dev) > up_write(&pci_bus_sem); > > pci_free_resources(dev); > - pci_dev_put(dev); > + put_device(&dev->dev); > } > > /** > -- > 1.7.1 > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/