From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754744AbbG2WcB (ORCPT ); Wed, 29 Jul 2015 18:32:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37253 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754533AbbG2Wb6 (ORCPT ); Wed, 29 Jul 2015 18:31:58 -0400 Date: Wed, 29 Jul 2015 15:31:09 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: linux-kernel@vger.kernel.org, lorenzo.pieralisi@arm.com, jason@lakedaemon.net, dhdang@apm.com, majun258@huawei.com, hanjun.guo@linaro.org, hpa@zytor.com, marc.zyngier@arm.com, wangyijing@huawei.com, mingo@kernel.org, tglx@linutronix.de, jiang.liu@linux.intel.com, linux-arm-kernel@lists.infradead.org, bhelgaas@google.com Reply-To: jiang.liu@linux.intel.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, bhelgaas@google.com, wangyijing@huawei.com, mingo@kernel.org, majun258@huawei.com, marc.zyngier@arm.com, hpa@zytor.com, hanjun.guo@linaro.org, lorenzo.pieralisi@arm.com, jason@lakedaemon.net, dhdang@apm.com, linux-kernel@vger.kernel.org In-Reply-To: <1438091186-10244-20-git-send-email-marc.zyngier@arm.com> References: <1438091186-10244-20-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] PCI/MSI: Drop domain field from msi_controller Git-Commit-ID: f075915ac0b11847fcfc8c4d55526a317e71c4d1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f075915ac0b11847fcfc8c4d55526a317e71c4d1 Gitweb: http://git.kernel.org/tip/f075915ac0b11847fcfc8c4d55526a317e71c4d1 Author: Marc Zyngier AuthorDate: Tue, 28 Jul 2015 14:46:26 +0100 Committer: Thomas Gleixner CommitDate: Thu, 30 Jul 2015 00:14:39 +0200 PCI/MSI: Drop domain field from msi_controller The only three users of that field are not using the msi_controller structure anymore, so drop it altogether. Acked-by: Bjorn Helgaas Signed-off-by: Marc Zyngier Cc: Cc: Yijing Wang Cc: Ma Jun Cc: Lorenzo Pieralisi Cc: Duc Dang Cc: Hanjun Guo Cc: Jiang Liu Cc: Jason Cooper Link: http://lkml.kernel.org/r/1438091186-10244-20-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- drivers/pci/msi.c | 3 --- include/linux/msi.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 4603344..f70aa0f 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -45,9 +45,6 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev) if (domain) return domain; - if (dev->bus->msi && (domain = dev->bus->msi->domain)) - return domain; - return arch_get_pci_msi_domain(dev); } diff --git a/include/linux/msi.h b/include/linux/msi.h index 809b749..ad939d0 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -160,9 +160,6 @@ struct msi_controller { struct device *dev; struct device_node *of_node; struct list_head list; -#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN - struct irq_domain *domain; -#endif int (*setup_irq)(struct msi_controller *chip, struct pci_dev *dev, struct msi_desc *desc);