lkml.org 
[lkml]   [2013]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH v8 05/22] PCI: make PCI device create/destroy logic symmetric
    Date
    On Friday, January 11, 2013 02:40:32 PM Yinghai Lu wrote:
    > From: Jiang Liu <jiang.liu@huawei.com>
    >
    > According to device model documentation, the way to create/destroy PCI
    > devices 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 is to either use
    > 1) device_register()/device_unregister()
    > or
    > 2) device_initialize()/device_add()/device_del()/put_device().
    >
    > So change PCI core logic to follow the rule and get rid of the redundant
    > pci_dev_get()/pci_dev_put() pair.
    >
    > Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
    > Acked-by: Bjorn Helgaas <bhelgaas@google.com>
    > Signed-by: Yinghai Lu <yinghai@kernel.org>

    Signed-off-by I suppose?

    Apart from this:

    Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

    > ---
    > 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 b97dea5..48b35e1 100644
    > --- a/drivers/pci/probe.c
    > +++ b/drivers/pci/probe.c
    > @@ -1298,7 +1298,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);
    >
    > set_dev_node(&dev->dev, pcibus_to_node(bus));
    > dev->dev.dma_mask = &dev->dma_mask;
    > diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
    > index 7c0fd92..fc38c48 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;
    > }
    >
    > @@ -37,7 +37,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);
    > }
    >
    > void pci_remove_bus(struct pci_bus *bus)
    >
    --
    I speak only for myself.
    Rafael J. Wysocki, Intel Open Source Technology Center.


    \
     
     \ /
      Last update: 2013-01-12 23:01    [W:4.037 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site