From patchwork Fri Sep 12 18:03:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 4897431 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 E65769F430 for ; Fri, 12 Sep 2014 18:02:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6999120266 for ; Fri, 12 Sep 2014 18:06:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D35C2026F for ; Fri, 12 Sep 2014 18:06:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752258AbaILSDc (ORCPT ); Fri, 12 Sep 2014 14:03:32 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:51519 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237AbaILSDa (ORCPT ); Fri, 12 Sep 2014 14:03:30 -0400 Received: by mail-ig0-f178.google.com with SMTP id a13so966198igq.5 for ; Fri, 12 Sep 2014 11:03:29 -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=liOz2WNMYF+wiCroMUOuKmAr3+jUArwi2jZ6jjYpWuU=; b=ZdPX4EU/R+/fp68aupbg8Y3EjOcZ8hjKAMoYgK7ljbxCzWyIIX8vVatKHqBe11KXVu W0CyLhNppOZ/qtB58B5uzS8wO3+PrtRKg9TcTEzJ4C7JRtZHnJKRPPL2frBxnSj6GlC/ xNO4NPOndD7EwyWovLQw4VpVPk2xNOEh1MITYh59w5BSHfeFZw2gIAnSdmf7VdkW9Bne e+m5UBLnRe62wya0lUAF2YKN5RKGp41X5H0As+BTu8Fli8nCZw8By8KHeXmvjBmBW43M rJOUxjphxd9yA89ORI9DM0r2mKYGSvRfyV8apuoZMCmQZ9K4ei2RJ+orT0zckN9FtNN+ ssFQ== 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=liOz2WNMYF+wiCroMUOuKmAr3+jUArwi2jZ6jjYpWuU=; b=VG7QRsXWVjCR0oFKAWQQPpt36OAHQRA19MssTfUhZjtYRbAyV3ye7ZKqWV3oCEQ+Hw PN4hhyvHc/oOb5SWSmdcuycO9OCeazaTfazze9gSLuyLZm9OSWXQ8N8G6lJMy/kfNbM+ CAf0TpkfACA55b5GoEUgKuea1vrEZ5WEZ1QNPM8k/Cqp2xgzqcMzWzgZnYBCDjTuHK9I Rjo3WwyK+4hhVofYyWk6V575THxtNFgi3V4SoBB33dKEk9HjzfSIRAUg2itRZMdP5fqu +PW89aMhBDrHJWlB6TvW0Bacwzlt9GqFxO6T5zjb3QYjyQ4bf125f7Fk8sRaGNLHwmDo brag== X-Gm-Message-State: ALoCoQnyhY3ZXVyIhvdrWL4YPZoyCqh+6kOFpP/HEQ9MZsTd0PcWi+OpBpeRT6a8PZ72wkIIr+p0 X-Received: by 10.50.136.167 with SMTP id qb7mr4292749igb.31.1410545009320; Fri, 12 Sep 2014 11:03:29 -0700 (PDT) Received: from localhost ([172.16.49.108]) by mx.google.com with ESMTPSA id i6sm2096907igm.6.2014.09.12.11.03.28 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 11:03:28 -0700 (PDT) Subject: [PATCH v1 06/13] PCI: shpchp: 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:28 -0600 Message-ID: <20140912180328.1630.45550.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 shpchp. 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/shpchp_pci.c | 8 +------- 1 file changed, 1 insertion(+), 7 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/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c index 469454e0cc48..f8cd3a27e351 100644 --- a/drivers/pci/hotplug/shpchp_pci.c +++ b/drivers/pci/hotplug/shpchp_pci.c @@ -69,13 +69,7 @@ int shpchp_configure_device(struct slot *p_slot) } pci_assign_unassigned_bridge_resources(bridge); - - list_for_each_entry(dev, &parent->devices, bus_list) { - if (PCI_SLOT(dev->devfn) != p_slot->device) - continue; - pci_configure_slot(dev); - } - + pcie_bus_configure_settings(parent); pci_bus_add_devices(parent); out: