From patchwork Tue Aug 4 21:54:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6944811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BA90EC05AC for ; Tue, 4 Aug 2015 22:07:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA1B92056E for ; Tue, 4 Aug 2015 22:07:11 +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 DF9262053C for ; Tue, 4 Aug 2015 22:07:10 +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 1ZMkKQ-00072c-PM; Tue, 04 Aug 2015 22:04:58 +0000 Received: from mail-io0-x232.google.com ([2607:f8b0:4001:c06::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZMkAd-0000cK-6D for linux-arm-kernel@lists.infradead.org; Tue, 04 Aug 2015 21:54:51 +0000 Received: by ioeg141 with SMTP id g141so31183170ioe.3 for ; Tue, 04 Aug 2015 14:54:30 -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=TIeOkd09pOWplw5dhCAnFIFgKugwcDzdhpi/wBHlV+A=; b=di5Xkc5Y7Yw/5v9gqzro4kLxgv9Ph7DJRXGsrA55zPB2wpn4eGGOowXvqr8DtmEnMF PYE4Dxrtcw5UgOchjBFZ28FipnT8Z1lpextRckUTa+NUrthkJdDk7jqm7mx+rNkl0wmD hE1drF1RIGsWdePZ6Z2w5Iz1AIPcC/NrFkyAHoACmlkxgnXEiQeo1hGh41eiN6AvgKi0 BkXyBUbApmmchkxfKsUPCS40LMUnKvEuQPLSRBOW3bZjcmUbdAQAwLIkAtYCqLmVIrt9 /lQ5ks2uObAhO+PucJ/KmfTBioXHBJBjMZi0qgDFbsHhK8E5ZK27ADlSvApkUsttTqtA vlgQ== 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=TIeOkd09pOWplw5dhCAnFIFgKugwcDzdhpi/wBHlV+A=; b=Ay0pg+cBZPonCxjwpRqwreavN/vSTNwzPOAIo11iDQemMCdyx7JyoVgIBZBxaWZNl4 nZUZGupRB0MkRz/Fe8mdOtLCtVEun5GmQqtuknd4+I15grhRbS/aNMk4+4m1sK+ah+Cz ooD2YD1AGwf/vgcIi12kQlhpuN72I28IRRqVBe59/nVClsdNT3VXKDd+vSqjr+cOvcUk 0N3gSvCe31co/Js4EVE3OySja/N7O74AqZ2tQUE6BhiY5f2OkMoR/52QFcG8ph21EuGN VBiOFKlA33EKs0VphZNrO/B/+yJZQzZjAzGyQy9RumyhwKutLzCsmEbGxW2jMKJPXNlL /tjw== X-Gm-Message-State: ALoCoQkK5I/kTLgeb6OPXz0BImGIeWQkBGCm5SNpcaCY3EMTk0UeOGiBZ1LtN9hEvMhFOf4UUR8G X-Received: by 10.107.40.147 with SMTP id o141mr6411165ioo.83.1438725270157; Tue, 04 Aug 2015 14:54:30 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id o39sm506792ioi.30.2015.08.04.14.54.28 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Aug 2015 14:54:29 -0700 (PDT) Subject: [PATCH v5 5/9] PCI/MSI: Remove unused pcibios_msi_controller() hook To: Lorenzo Pieralisi From: Bjorn Helgaas Date: Tue, 04 Aug 2015 16:54:28 -0500 Message-ID: <20150804215428.9189.60846.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_145451_320806_EC28F4C4 X-CRM114-Status: GOOD ( 13.29 ) X-Spam-Score: -2.1 (--) 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=ham 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 The pcibios_msi_controller() hook was only implemented by ARM, and it sets pci_bus->msi now, so it doesn't need this hook anymore. Remove the unused pcibios_msi_controller() hook. [bhelgaas: changelog, split into separate patch] Signed-off-by: Lorenzo Pieralisi Signed-off-by: Bjorn Helgaas --- drivers/pci/msi.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index f66be868..0d20142 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -77,24 +77,9 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev) /* Arch hooks */ -struct msi_controller * __weak pcibios_msi_controller(struct pci_dev *dev) -{ - return NULL; -} - -static struct msi_controller *pci_msi_controller(struct pci_dev *dev) -{ - struct msi_controller *msi_ctrl = dev->bus->msi; - - if (msi_ctrl) - return msi_ctrl; - - return pcibios_msi_controller(dev); -} - int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) { - struct msi_controller *chip = pci_msi_controller(dev); + struct msi_controller *chip = dev->bus->msi; int err; if (!chip || !chip->setup_irq)