From patchwork Fri Sep 21 08:43:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 185613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DE5422C007C for ; Fri, 21 Sep 2012 18:44:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756922Ab2IUIoc (ORCPT ); Fri, 21 Sep 2012 04:44:32 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:10791 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756701Ab2IUIoa (ORCPT ); Fri, 21 Sep 2012 04:44:30 -0400 Received: from 172.24.2.119 (EHLO szxeml212-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id API39072; Fri, 21 Sep 2012 16:44:23 +0800 (CST) Received: from SZXEML418-HUB.china.huawei.com (10.82.67.157) by szxeml212-edg.china.huawei.com (172.24.2.181) with Microsoft SMTP Server (TLS) id 14.1.323.3; Fri, 21 Sep 2012 16:44:07 +0800 Received: from localhost (10.135.76.84) by szxeml418-hub.china.huawei.com (10.82.67.157) with Microsoft SMTP Server id 14.1.323.3; Fri, 21 Sep 2012 16:43:57 +0800 From: Yijing Wang To: Bjorn Helgaas , Huang Ying , Chen Gong CC: , Hanjun Guo , , Yijing Wang Subject: [PATCH v5 5/5] PCI/AER: free pci_bus_ops_list and remove pci_bus_ops_pop Date: Fri, 21 Sep 2012 16:43:13 +0800 Message-ID: <1348216993-6948-6-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1348216993-6948-1-git-send-email-wangyijing@huawei.com> References: <1348216993-6948-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.135.76.84] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rewrite pci_bus_ops_list release code for simplification, and clean no used function pci_bus_ops_pop(). Signed-off-by: Yijing Wang Reviewed-by: Huang Ying --- drivers/pci/pcie/aer/aer_inject.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c index c5372dd..14d2c92 100644 --- a/drivers/pci/pcie/aer/aer_inject.c +++ b/drivers/pci/pcie/aer/aer_inject.c @@ -143,23 +143,6 @@ static struct pci_ops *__find_pci_bus_ops(struct pci_bus *bus) return __find_pci_bus_ops_parent(bus); } -static struct pci_bus_ops *pci_bus_ops_pop(void) -{ - unsigned long flags; - struct pci_bus_ops *bus_ops = NULL; - - spin_lock_irqsave(&inject_lock, flags); - if (list_empty(&pci_bus_ops_list)) - bus_ops = NULL; - else { - struct list_head *lh = pci_bus_ops_list.next; - list_del(lh); - bus_ops = list_entry(lh, struct pci_bus_ops, list); - } - spin_unlock_irqrestore(&inject_lock, flags); - return bus_ops; -} - static u32 *find_pci_config_dword(struct aer_error *err, int where, int *prw1cs) { @@ -608,7 +591,7 @@ static void __exit aer_inject_exit(void) { struct aer_error *err, *err_next; unsigned long flags; - struct pci_bus_ops *bus_ops; + struct pci_bus_ops *bus_ops, *tmp_ops; bus_unregister_notifier(&pci_bus_type, &aerinj_hp_notifier); misc_deregister(&aer_inject_device); @@ -617,8 +600,12 @@ static void __exit aer_inject_exit(void) pci_bus_set_ops(bus_ops->bus, bus_ops->ops); clean_untracked_pci_ops_aer(); - while ((bus_ops = pci_bus_ops_pop())) + + /* free pci_bus_ops_list */ + list_for_each_entry_safe(bus_ops, tmp_ops, &pci_bus_ops_list, list) { + list_del(&bus_ops->list); kfree(bus_ops); + } spin_lock_irqsave(&inject_lock, flags); list_for_each_entry_safe(err, err_next, &einjected, list) {