Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932903AbbGGRT2 (ORCPT ); Tue, 7 Jul 2015 13:19:28 -0400 Received: from foss.arm.com ([217.140.101.70]:37027 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932540AbbGGRSw (ORCPT ); Tue, 7 Jul 2015 13:18:52 -0400 From: Marc Zyngier To: Bjorn Helgaas , Thomas Gleixner , Jiang Liu , Jason Cooper Cc: , , , Yijing Wang , Ma Jun , Lorenzo Pieralisi Subject: [PATCH v3 15/15] PCI/MSI: Drop domain field from msi_controller Date: Tue, 7 Jul 2015 18:18:05 +0100 Message-Id: <1436289485-28230-16-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436289485-28230-1-git-send-email-marc.zyngier@arm.com> References: <1436289485-28230-1-git-send-email-marc.zyngier@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1366 Lines: 44 The only three users of that field are not using the msi_controller structure anymore, so drop it altogether. Signed-off-by: Marc Zyngier --- drivers/pci/msi.c | 2 -- include/linux/msi.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 5ffc340..d62fdb0 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -42,8 +42,6 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev) struct irq_domain *domain = NULL; domain = dev_get_msi_domain(&dev->dev); - if (!domain && dev->bus->msi) - domain = dev->bus->msi->domain; if (!domain) domain = arch_get_pci_msi_domain(dev); diff --git a/include/linux/msi.h b/include/linux/msi.h index 8ac4a68..692f217 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -108,9 +108,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); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/