From patchwork Tue Aug 4 21:54:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6944861 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 590D39F358 for ; Tue, 4 Aug 2015 22:48:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E39F20411 for ; Tue, 4 Aug 2015 22:48:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9113C203C4 for ; Tue, 4 Aug 2015 22:48:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZMkyM-0007rH-1V; Tue, 04 Aug 2015 22:46:14 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZMkyJ-0007qv-Ub for linux-arm-kernel@bombadil.infradead.org; Tue, 04 Aug 2015 22:46:12 +0000 Received: from mail-ig0-x230.google.com ([2607:f8b0:4001:c05::230]) by merlin.infradead.org with esmtps (Exim 4.85 #2 (Red Hat Linux)) id 1ZMkAZ-0006SO-3Y for linux-arm-kernel@lists.infradead.org; Tue, 04 Aug 2015 21:54:48 +0000 Received: by igk11 with SMTP id 11so102421682igk.1 for ; Tue, 04 Aug 2015 14:54:23 -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=0ZIJulKB/VnojRaTsjkJyEMkqK24iOLvm5IcgxpGRng=; b=Ab2I2U7v4VeS+KpMr/I62ntdNeKH+VKyT7fj9Ki1jsCtZz52g85uhtXo+hNc2fDNCl 1ydKD/aqyKqq2qEcE01AEjix1LLBwYKaytBJ9/3b925TjyBi10diZFM+PPAwmEt9dKq+ 454MS//AyIzV4NGJUa5GxpnbiB7xqCasnPHJtw+0M6EENF9hQEUNYzNJIdXLK4OaCHBH 74UQyLUVSzd60blTlzuoWeeANOzgf2Dr8bAejZ923GpvlnVwjLqYFM762U/84x3UfRtL f1PzFBhJxpqAu1WqhHz8fVZYj+mpv6omHN21YQobaKOkW8QUQYtJkAYlMGdikJ879Boa ahyw== 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=0ZIJulKB/VnojRaTsjkJyEMkqK24iOLvm5IcgxpGRng=; b=eAoE4pArM6fkWmMMslhkRbqbF2pvqVB3YqhvKs24gvyEM1NrjASXs2D2su7Sj3p5V5 6d0b4XlBmjZy2+2LZnKXeqfrYHWSRsz3dWkvoKoS0coAmmeQU+2xVT5uzuEUFcNMohQR QiRc75/VX6/bFymDjeEDNA5OQGdsfQ5mReLzRNay/tvQcw8RxPuspX4Em9/H66BfJZwv UBwQm5j2gda+WRdsDSzGCCiPO1X044+O0/cwlrgs4xzdczVsaKIaPDuSP6/mcLj9MpnJ CK/gnSvmge8XG8quBqrlLIDcc8bdh28MN7t0qpjO6vVn4XulNFv/oo8lXOxr1Hs5x1LM 44ZQ== X-Gm-Message-State: ALoCoQmCv7ckwKT6uGEbqNFPKu5TuFQtCOixAW6GDSmG2Cfe7GHEW+QSddxoqELzIYxqw0eX0vcm X-Received: by 10.50.43.167 with SMTP id x7mr7003949igl.95.1438725262926; Tue, 04 Aug 2015 14:54:22 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id qf2sm2059113igb.20.2015.08.04.14.54.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Aug 2015 14:54:21 -0700 (PDT) Subject: [PATCH v5 4/9] ARM/PCI: Remove msi_controller from struct pci_sys_data To: Lorenzo Pieralisi From: Bjorn Helgaas Date: Tue, 04 Aug 2015 16:54:20 -0500 Message-ID: <20150804215420.9189.22914.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150804214234.9189.42548.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150804214234.9189.42548.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150804_175447_214570_EB78F0CF X-CRM114-Status: GOOD ( 14.73 ) X-Spam-Score: -2.9 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Duc Dang , Russell King , Arnd Bergmann , Gabriele Paoloni , Marc Zyngier , linux-pci@vger.kernel.org, Pratyush Anand , Michal Simek , Simon Horman , James Morse , Tanmay Inamdar , Jingoo Han , Thierry Reding , Jayachandran C , linux-arm-kernel@lists.infradead.org, Jason Cooper Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_MED,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 From: Lorenzo Pieralisi ARM now uses pci_bus->msi to store the msi_controller pointer, so we don't need to save it in struct pci_sys_data, and we don't need to implement pcibios_msi_controller() to get it out of pci_sys_data. Remove msi_controller from struct pci_sys_data and pcibios_msi_controller(). [bhelgaas: changelog, split into separate patch] Signed-off-by: Lorenzo Pieralisi Signed-off-by: Bjorn Helgaas Reviewed-by: Jingoo Han --- arch/arm/include/asm/mach/pci.h | 3 --- arch/arm/kernel/bios32.c | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index c074e7a..8857d28 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -40,9 +40,6 @@ struct hw_pci { * Per-controller structure */ struct pci_sys_data { -#ifdef CONFIG_PCI_MSI - struct msi_controller *msi_ctrl; -#endif struct list_head node; int busnr; /* primary bus number */ u64 mem_offset; /* bus->cpu memory mapping offset */ diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 283bc1c..874e182 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -18,15 +18,6 @@ static int debug_pci; -#ifdef CONFIG_PCI_MSI -struct msi_controller *pcibios_msi_controller(struct pci_dev *dev) -{ - struct pci_sys_data *sysdata = dev->bus->sysdata; - - return sysdata->msi_ctrl; -} -#endif - /* * We can't use pci_get_device() here since we are * called from interrupt context. @@ -462,9 +453,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, if (WARN(!sys, "PCI: unable to allocate sys data!")) break; -#ifdef CONFIG_PCI_MSI - sys->msi_ctrl = hw->msi_ctrl; -#endif sys->busnr = busnr; sys->swizzle = hw->swizzle; sys->map_irq = hw->map_irq;