From patchwork Sat May 25 13:48:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 2613391 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 738FD4020A for ; Sat, 25 May 2013 13:52:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756140Ab3EYNvl (ORCPT ); Sat, 25 May 2013 09:51:41 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:53392 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756621Ab3EYNvi (ORCPT ); Sat, 25 May 2013 09:51:38 -0400 Received: by mail-pd0-f172.google.com with SMTP id 10so5136630pdi.3 for ; Sat, 25 May 2013 06:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vPGmf2jFu29zONLg8R++vR46iXjLS2KMwPM/WU5bj1M=; b=C+kMVcvRXlk3Z80Y9OcC6NUypYCDkcSiQC580of8uPurnJYHWSMxlhJ6kNFJc5FGcM IwZTnknotTVz3bj9BDK3DKf4KetLrQqL1ysGkTQtCR38BHGrfdzQRAeTsMgMalxLAzLz qPcxcgxCQwg9WqJZXIXuBPefR0rcFikntRTnLv8uJgzcTz/e6AsmNEa4/gPvtpCUVD+Z hk+wn/vQ4tOECbI52e63gkVhADSzHy+Zzl9capye9Xah3F3HexSB0Wy152U1zd3E+/Sg qW5tHEytuY5IROCZjWJUdabzrzfY9MemcALAUU1Pcj4w2KnoznfHNaBbbgBkzCDTGIz6 kICQ== X-Received: by 10.68.193.138 with SMTP id ho10mr22000229pbc.163.1369489898156; Sat, 25 May 2013 06:51:38 -0700 (PDT) Received: from localhost.localdomain ([114.250.94.230]) by mx.google.com with ESMTPSA id b7sm20545858pba.39.2013.05.25.06.51.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 25 May 2013 06:51:37 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu Cc: Jiang Liu , "Rafael J . Wysocki" , Greg Kroah-Hartman , Gu Zheng , Toshi Kani , Myron Stowe , Yijing Wang , Jiang Liu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Metcalf , Thierry Reding Subject: [PATCH v3, part1 04/10] PCI: mark pci_scan_bus_parented() as __deprecated Date: Sat, 25 May 2013 21:48:32 +0800 Message-Id: <1369489718-25869-5-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369489718-25869-1-git-send-email-jiang.liu@huawei.com> References: <1369489718-25869-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Mark pci_scan_bus_parented() as __deprecated and clean up outdated comments. Signed-off-by: Jiang Liu Cc: Chris Metcalf Cc: Greg Kroah-Hartman Cc: Thierry Reding Cc: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org Acked-by: Chris Metcalf [for tile] --- arch/tile/kernel/pci.c | 3 --- include/linux/pci.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 67237d3..936e087 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -309,9 +309,6 @@ int __init pcibios_init(void) * * It reads the PCI tree for this bus into the Linux * data structures. - * - * This is inlined in linux/pci.h and calls into - * pci_scan_bus_parented() in probe.c. */ pci_add_resource(&resources, &ioport_resource); pci_add_resource(&resources, &iomem_resource); diff --git a/include/linux/pci.h b/include/linux/pci.h index b0f4a82..7b23fa0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -720,8 +720,8 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, void pcibios_scan_specific_bus(int busn); struct pci_bus *pci_find_bus(int domain, int busnr); void pci_bus_add_devices(const struct pci_bus *bus); -struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, - struct pci_ops *ops, void *sysdata); +struct pci_bus * __deprecated pci_scan_bus_parented(struct device *parent, + int bus, struct pci_ops *ops, void *sysdata); struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata); struct pci_bus *pci_create_root_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata,