From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06BFDC433DF for ; Fri, 22 May 2020 23:48:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D814A20738 for ; Fri, 22 May 2020 23:48:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590191316; bh=z2d0ZO4NuaUbDMIWyNZgG9sB8T6D+nKAx2l7ppweH4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y1OSj3RF/HZYlTB2SzYU/x7EFwXAQWYAqFI7BZypWCxjgSAbwMJQfJlFuXlApHQ4K nEDKcznET8gB1667TEKHrDzZReDcrvc0mn+YUioZsn5kbfB9v7u9XIudjLkngK7Yk6 KpR4d7w5IB2KozZVFsREbnMrRlmA6QCRdV4jQPL0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726546AbgEVXsg (ORCPT ); Fri, 22 May 2020 19:48:36 -0400 Received: from mail-il1-f196.google.com ([209.85.166.196]:32777 "EHLO mail-il1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731183AbgEVXsg (ORCPT ); Fri, 22 May 2020 19:48:36 -0400 Received: by mail-il1-f196.google.com with SMTP id y17so10294108ilg.0 for ; Fri, 22 May 2020 16:48:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oGPS1/9t2DbdpX0irS4os0tkteUYvgsNTUcQ44RgQLA=; b=MAzGQPXpcPqfb1n9keVTxhWxPFSYJQZshRMjVv9QFUvYSDG50LceLrG6u9fVbenVLX V5fOydE53btfFa4LvSR8+6lPaUbZSzSvX/Hl6n+tEWrPRGKIa1jG71min6okzSG1ZCRL Gs4g0wlZOH06koJXh/fa+15ZHdBHLjZ4W7yLGhuobZQ2nwtH4UlnwzZWInqsjAa6D/ja fm9KOr6TdEL1839Brdz0o4tvNMYgmpsD/ocINRQd2FoMeIxEKQHZyGrJwhku/Em0h9sM RVQcS6KblTWlZ+5ZEBUmTDPyCpT7t0IXC7ZjYd6JvI3pNRsb2wlIaNpR0o4p7E6m4jrY llsw== X-Gm-Message-State: AOAM533nUcttxtOoRSm6OtTYuwbIdOW4nonkQ33lmUfyRZfRSwxGgpKs +ILTqzU5r9ipqrz3Wp927g== X-Google-Smtp-Source: ABdhPJyuqDfEj9pKyUgEYZRO+cysIrAtCQrOxTDCZeXzJp8d1Psmue13wAQH//FdOBy3lTptmkGmxw== X-Received: by 2002:a92:d6c5:: with SMTP id z5mr15613014ilp.194.1590191315033; Fri, 22 May 2020 16:48:35 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.252]) by smtp.googlemail.com with ESMTPSA id w23sm4390877iod.9.2020.05.22.16.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 16:48:34 -0700 (PDT) From: Rob Herring To: Lorenzo Pieralisi Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Joseph Subject: [PATCH 01/15] PCI: cadence: Use struct pci_host_bridge.windows list directly Date: Fri, 22 May 2020 17:48:18 -0600 Message-Id: <20200522234832.954484-2-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200522234832.954484-1-robh@kernel.org> References: <20200522234832.954484-1-robh@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org There's no need to create a temporary resource list and then splice it to struct pci_host_bridge.windows list. Just use pci_host_bridge.windows directly. The necessary clean-up is already handled by the PCI core. Cc: Tom Joseph Signed-off-by: Rob Herring --- .../controller/cadence/pcie-cadence-host.c | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c index 8c2543f28ba0..9f77e47983c3 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-host.c +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c @@ -169,14 +169,15 @@ static int cdns_pcie_host_init_address_translation(struct cdns_pcie_rc *rc) } static int cdns_pcie_host_init(struct device *dev, - struct list_head *resources, struct cdns_pcie_rc *rc) { + struct pci_host_bridge *bridge = pci_host_bridge_from_priv(rc); struct resource *bus_range = NULL; int err; /* Parse our PCI ranges and request their resources */ - err = pci_parse_request_of_pci_ranges(dev, resources, NULL, &bus_range); + err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL, + &bus_range); if (err) return err; @@ -185,17 +186,9 @@ static int cdns_pcie_host_init(struct device *dev, err = cdns_pcie_host_init_root_port(rc); if (err) - goto err_out; - - err = cdns_pcie_host_init_address_translation(rc); - if (err) - goto err_out; - - return 0; + return err; - err_out: - pci_free_resource_list(resources); - return err; + return cdns_pcie_host_init_address_translation(rc); } int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) @@ -204,7 +197,6 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) struct platform_device *pdev = to_platform_device(dev); struct device_node *np = dev->of_node; struct pci_host_bridge *bridge; - struct list_head resources; struct cdns_pcie *pcie; struct resource *res; int ret; @@ -248,11 +240,10 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) pcie->mem_res = res; - ret = cdns_pcie_host_init(dev, &resources, rc); + ret = cdns_pcie_host_init(dev, rc); if (ret) goto err_init; - list_splice_init(&resources, &bridge->windows); bridge->dev.parent = dev; bridge->busnr = pcie->bus; bridge->ops = &cdns_pcie_host_ops; @@ -261,13 +252,10 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) ret = pci_host_probe(bridge); if (ret < 0) - goto err_host_probe; + goto err_init; return 0; - err_host_probe: - pci_free_resource_list(&resources); - err_init: pm_runtime_put_sync(dev); -- 2.25.1