From patchwork Wed Jun 10 19:56:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 29388 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5AJvd4n003381 for ; Wed, 10 Jun 2009 19:57:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761603AbZFJT4e (ORCPT ); Wed, 10 Jun 2009 15:56:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761567AbZFJT4e (ORCPT ); Wed, 10 Jun 2009 15:56:34 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:47777 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761595AbZFJT4d (ORCPT ); Wed, 10 Jun 2009 15:56:33 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n5AJuWih031402 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Jun 2009 12:56:33 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n5AJuWI5009510; Wed, 10 Jun 2009 12:56:32 -0700 Message-Id: <200906101956.n5AJuWI5009510@imap1.linux-foundation.org> Subject: [patch 3/4] pci: eliminate redundant pci_stop_dev() call from pci_destroy_dev() To: jbarnes@virtuousgeek.org Cc: linux-pci@vger.kernel.org, akpm@linux-foundation.org, achiang@hp.com From: akpm@linux-foundation.org Date: Wed, 10 Jun 2009 12:56:31 -0700 X-Spam-Status: No, hits=-3.502 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Alex Chiang We always call pci_stop_bus_device before calling pci_destroy_dev. Since pci_stop_bus_device calls pci_stop_dev, there is no need for pci_destroy_dev to repeat the call. Signed-off-by: Alex Chiang Cc: Jesse Barnes Signed-off-by: Andrew Morton --- drivers/pci/remove.c | 2 -- 1 file changed, 2 deletions(-) diff -puN drivers/pci/remove.c~pci-eliminate-redundant-pci_stop_dev-call-from-pci_destroy_dev drivers/pci/remove.c --- a/drivers/pci/remove.c~pci-eliminate-redundant-pci_stop_dev-call-from-pci_destroy_dev +++ a/drivers/pci/remove.c @@ -32,8 +32,6 @@ static void pci_stop_dev(struct pci_dev static void pci_destroy_dev(struct pci_dev *dev) { - pci_stop_dev(dev); - /* Remove the device from the device lists, and prevent any further * list accesses from this device */ down_write(&pci_bus_sem);