From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <51DF679D.2000000@huawei.com> Date: Fri, 12 Jul 2013 10:19:09 +0800 From: Yijing Wang MIME-Version: 1.0 To: Paul Bolle CC: Bjorn Helgaas , , , Rafael , Hanjun Guo , , Oliver Neukum , Gu Zheng Subject: Re: [PATCH -v2 2/3] PCI,pciehp: avoid add a device already exist before suspend during resume References: <1373535825-49972-1-git-send-email-wangyijing@huawei.com> <1373535825-49972-3-git-send-email-wangyijing@huawei.com> <1373552859.1349.9.camel@x61.thuisdomein> In-Reply-To: <1373552859.1349.9.camel@x61.thuisdomein> Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: >> --- >> drivers/pci/hotplug/pciehp_core.c | 9 ++++++--- >> 1 files changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c >> index 7d72c5e..1542735 100644 >> --- a/drivers/pci/hotplug/pciehp_core.c >> +++ b/drivers/pci/hotplug/pciehp_core.c > [...] >> @@ -311,10 +312,12 @@ static int pciehp_resume (struct pcie_device *dev) >> >> /* Check if slot is occupied */ >> pciehp_get_adapter_status(slot, &status); >> - if (status) >> - pciehp_enable_slot(slot); >> - else >> + if (status) { >> + if (list_empty(&pbus->devices)) >> + pciehp_enable_slot(slot); >> + } else if (!list_empty(&pbus->devices)) >> pciehp_disable_slot(slot); >> + > > Coding style: braces for the "else if" branch too? Or change the first > test to "if (status && list_empty([...]))" and drop the braces? Hmmm, I will add the braces for "else if " Change the first test "if (status && list_empty([...]))" is not a good idea, because this change will modify the code logic, for example if a device was present before suspend and still there during resume, we should do nothing, but after the logic change, we may disable it. > >> return 0; >> } >> #endif /* PM */ > > > Paul Bolle > > > . > -- Thanks! Yijing