From patchwork Wed Mar 7 15:42:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 10264275 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A57BF602C8 for ; Wed, 7 Mar 2018 15:44:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93544283ED for ; Wed, 7 Mar 2018 15:44:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 920F6284B9; Wed, 7 Mar 2018 15:44:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07E2C295D7 for ; Wed, 7 Mar 2018 15:42:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933846AbeCGPmx (ORCPT ); Wed, 7 Mar 2018 10:42:53 -0500 Received: from mail-oi0-f67.google.com ([209.85.218.67]:34697 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933746AbeCGPmw (ORCPT ); Wed, 7 Mar 2018 10:42:52 -0500 Received: by mail-oi0-f67.google.com with SMTP id c83so1991340oib.1 for ; Wed, 07 Mar 2018 07:42:52 -0800 (PST) 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; bh=Dcsk1A75oE5tqMQC6/yEI/ZQZLrUihR7CHdhQjG1edA=; b=A1qOPYxtpCK0iIk7ERQBMe5XN7vOcon/aiqJwlpUIdPhfe8vh4Ga5jC03F7Ji8cCna hVVwG2XymMx25oEpmCZJYExCtLLjb3ywBI7CeijDN7elhPvy6WLWODpCildDQb0BGYBT B5DIVsvA3++9/ekkYxwvHI91tM5RJ+UPzPKbsx+tj36Dwob/yseovgaEHqmWNGSDM40r kz4HwxCU26MJaBBtsopmX1RM1HTAJD21DBmKc0nh6o/xnFa8pa8/b+OFh1asOsS7tQpY xLiUc3qIXWvopOujbrBJeVJSo7AkI4++9LMGvt0wGoZveZTN+9FAB82eL6M+uqeMxRgN A96Q== X-Gm-Message-State: AElRT7GWMY2etqwkZBv3LGVAaawce0DB2NSiR6h2xEN2dXSgz52cDbtv 3WUOgYNrLN8hiaRjUg8A6g== X-Google-Smtp-Source: AG47ELs3JJXlpyWqOQMhhpJVXyGN2KYNDSoqF4BmGW4OgKOnzCVeUNuYPVBSHrRtrap/DhBSEidW/g== X-Received: by 10.202.234.130 with SMTP id i124mr13903099oih.248.1520437371865; Wed, 07 Mar 2018 07:42:51 -0800 (PST) Received: from xps15.herring.priv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id v125sm8273842oie.8.2018.03.07.07.42.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 07:42:51 -0800 (PST) From: Rob Herring To: Bjorn Helgaas , Lorenzo Pieralisi Cc: linux-pci@vger.kernel.org, Ray Jui , Scott Branden , Jon Mason Subject: [PATCH 2/9] PCI: iproc: remove dependency on ARM specific struct pci_sys_data Date: Wed, 7 Mar 2018 09:42:36 -0600 Message-Id: <20180307154243.3205-3-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180307154243.3205-1-robh@kernel.org> References: <20180307154243.3205-1-robh@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The iproc driver is using ARM's struct pci_sys_data simply to store a private data pointer. This is completely unnecessary, so store the private data directly in bus->sysdata as is done on arm64. Signed-off-by: Rob Herring Acked-by: Scott Branden --- drivers/pci/host/pcie-iproc-bcma.c | 3 +-- drivers/pci/host/pcie-iproc.c | 19 ++----------------- drivers/pci/host/pcie-iproc.h | 4 ---- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/pci/host/pcie-iproc-bcma.c b/drivers/pci/host/pcie-iproc-bcma.c index 603c83429cb3..aa55b064f64d 100644 --- a/drivers/pci/host/pcie-iproc-bcma.c +++ b/drivers/pci/host/pcie-iproc-bcma.c @@ -25,8 +25,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x8012, bcma_pcie2_fixup_class); static int iproc_pcie_bcma_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - struct pci_sys_data *sys = dev->sysdata; - struct iproc_pcie *pcie = sys->private_data; + struct iproc_pcie *pcie = dev->sysdata; struct bcma_device *bdev = container_of(pcie->dev, struct bcma_device, dev); return bcma_core_irq(bdev, 5); diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index cbb095481cdc..3c76c5fa4f32 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -377,14 +377,7 @@ static const u16 iproc_pcie_reg_paxc_v2[] = { static inline struct iproc_pcie *iproc_data(struct pci_bus *bus) { - struct iproc_pcie *pcie; -#ifdef CONFIG_ARM - struct pci_sys_data *sys = bus->sysdata; - - pcie = sys->private_data; -#else - pcie = bus->sysdata; -#endif + struct iproc_pcie *pcie = bus->sysdata; return pcie; } @@ -1331,7 +1324,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) { struct device *dev; int ret; - void *sysdata; struct pci_bus *child; struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie); @@ -1376,13 +1368,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) goto err_power_off_phy; } -#ifdef CONFIG_ARM - pcie->sysdata.private_data = pcie; - sysdata = &pcie->sysdata; -#else - sysdata = pcie; -#endif - ret = iproc_pcie_check_link(pcie); if (ret) { dev_err(dev, "no PCIe EP device detected\n"); @@ -1399,7 +1384,7 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) host->busnr = 0; host->dev.parent = dev; host->ops = &iproc_pcie_ops; - host->sysdata = sysdata; + host->sysdata = pcie; host->map_irq = pcie->map_irq; host->swizzle_irq = pci_common_swizzle; diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h index d55f56a186cd..814b600b383a 100644 --- a/drivers/pci/host/pcie-iproc.h +++ b/drivers/pci/host/pcie-iproc.h @@ -54,7 +54,6 @@ struct iproc_msi; * @reg_offsets: register offsets * @base: PCIe host controller I/O register base * @base_addr: PCIe host controller register base physical address - * @sysdata: Per PCI controller data (ARM-specific) * @root_bus: pointer to root bus * @phy: optional PHY device that controls the Serdes * @map_irq: function callback to map interrupts @@ -80,9 +79,6 @@ struct iproc_pcie { u16 *reg_offsets; void __iomem *base; phys_addr_t base_addr; -#ifdef CONFIG_ARM - struct pci_sys_data sysdata; -#endif struct resource mem; struct pci_bus *root_bus; struct phy *phy;