From patchwork Fri Sep 12 18:03:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 4897441 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A277E9F430 for ; Fri, 12 Sep 2014 18:02:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2124320221 for ; Fri, 12 Sep 2014 18:06:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6938B2024C for ; Fri, 12 Sep 2014 18:06:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752197AbaILSD2 (ORCPT ); Fri, 12 Sep 2014 14:03:28 -0400 Received: from mail-ie0-f176.google.com ([209.85.223.176]:37484 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171AbaILSDX (ORCPT ); Fri, 12 Sep 2014 14:03:23 -0400 Received: by mail-ie0-f176.google.com with SMTP id ar1so1340491iec.7 for ; Fri, 12 Sep 2014 11:03:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=UkmFcm7mwL3o6XccOBb6vLxY99aDcOoy+Cgg/WErjZY=; b=IzwbS8n/YHJXv099+0WdWV9v+tD22rImrRhacqpgWB743P0CrtpP9OlO+Py0Ux0j47 1rN06Fr8yGcc8WD8cF2eBxLuO+g+xzDSC9n8jXxbV/LLC1S5hlmBwwB/WtU90UgDXq8P cn011ueV+eghEQe20PoX/32bKgcaTnX8xrFpRcLZJ2A3pM0qfFt1YvA3AzxI9IzDtyK1 o0Yn9y9yDcEzSk619N4wAVtgq1NKMCllAQxVwa1ysvhF0Cifvc/KYGpCWMnwL5v+izms ECkkgBGqYhA/Af8pDrwo6oC4ME37GGvec0Dzvny/K7F65n6+AE3GHyZIL5lfPHQUACdd IZfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=UkmFcm7mwL3o6XccOBb6vLxY99aDcOoy+Cgg/WErjZY=; b=TtqUQgdGQl1R+ZKe8WpPP92C/c+UHOhJwoE6djcZ3D+rJOOy9eQfgB4ulMohyQt5HC SRWTsJTvhDNM6Nze7vI6q3Y0+sJ1kUIUWRDjG3blEYxFdl2TsvJQcdszqA6LcL3lmgv0 zBVdEk4MBvO7r8FjQ6ivxG5sNfb8HpF2QaMdiUQUJqSyP+RbNUu61AYOvUiUkTGbHPY7 Xax1rwDKzIGy7MvHU0Yz5GxFl7G4taonkVkpUIJdb+pubxhiflXdVwp761Dsc5cyvByk Gzca1VANF78I8GNPf6/PjtQ++2v1xt95b2juJubB789ZWe8mehA8PHqj8NoMUKTbAemN RIWA== X-Gm-Message-State: ALoCoQlESQd79LWABu7XHwKsFIkidNqZY8TK0I/0RWb9erU1UuPX+ZhvQJ0n1N9UT8IWa9jr9hC+ X-Received: by 10.42.30.142 with SMTP id v14mr11744963icc.66.1410545002893; Fri, 12 Sep 2014 11:03:22 -0700 (PDT) Received: from localhost ([172.16.49.108]) by mx.google.com with ESMTPSA id z2sm2076571igl.16.2014.09.12.11.03.22 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 11:03:22 -0700 (PDT) Subject: [PATCH v1 05/13] PCI: pciehp: Remove pci_configure_slot() usage To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Rajat Jain , Linus Torvalds , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu Date: Fri, 12 Sep 2014 12:03:21 -0600 Message-ID: <20140912180321.1630.88175.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20140912180141.1630.17120.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20140912180141.1630.17120.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We now configure each PCI device as it is enumerated, in pci_device_add(), so remove the configuration done in pciehp. That configuration, in pci_configure_device(), does not include the MPS/MRRS configuration done by pcie_bus_configure_settings(), so keep that here. Signed-off-by: Bjorn Helgaas --- drivers/pci/hotplug/pciehp_pci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index b66812703415..9e69403be632 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c @@ -65,10 +65,7 @@ int pciehp_configure_device(struct slot *p_slot) pci_hp_add_bridge(dev); pci_assign_unassigned_bridge_resources(bridge); - - list_for_each_entry(dev, &parent->devices, bus_list) - pci_configure_slot(dev); - + pcie_bus_configure_settings(parent); pci_bus_add_devices(parent); out: