| Message ID | 1472744284-18305-4-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/09/16 16:38, Thomas Petazzoni wrote: > All the users of the small MSI controller API have been migrated to use > the generic MSI infrastructure instead. We no longer need a global > chained list of msi_controller. Instead, MSI controllers are now > represented as irq domains attached to OF nodes, and the resolution > between a device requesting an MSI and the corresponding MSI controller > is done by the generic interrupt resolution logic. > > Therefore, this API is now completely useless, and can be removed from > the kernel. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Assuming no further issue with the two affected drivers: Acked-by: Marc Zyngier <marc.zyngier@arm.com> M.
On Thu, Sep 1, 2016 at 10:38 AM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > All the users of the small MSI controller API have been migrated to use > the generic MSI infrastructure instead. We no longer need a global > chained list of msi_controller. Instead, MSI controllers are now > represented as irq domains attached to OF nodes, and the resolution > between a device requesting an MSI and the corresponding MSI controller > is done by the generic interrupt resolution logic. > > Therefore, this API is now completely useless, and can be removed from > the kernel. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > drivers/of/of_pci.c | 45 --------------------------------------------- > include/linux/of_pci.h | 11 ----------- > 2 files changed, 56 deletions(-) This is to both Bjorn and me, but I'm assuming you want Bjorn to take the series. Acked-by: Rob Herring <robh@kernel.org> Rob
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index 589b30c..ea15616 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c @@ -263,48 +263,3 @@ parse_failed: } EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); #endif /* CONFIG_OF_ADDRESS */ - -#ifdef CONFIG_PCI_MSI - -static LIST_HEAD(of_pci_msi_chip_list); -static DEFINE_MUTEX(of_pci_msi_chip_mutex); - -int of_pci_msi_chip_add(struct msi_controller *chip) -{ - if (!of_property_read_bool(chip->of_node, "msi-controller")) - return -EINVAL; - - mutex_lock(&of_pci_msi_chip_mutex); - list_add(&chip->list, &of_pci_msi_chip_list); - mutex_unlock(&of_pci_msi_chip_mutex); - - return 0; -} -EXPORT_SYMBOL_GPL(of_pci_msi_chip_add); - -void of_pci_msi_chip_remove(struct msi_controller *chip) -{ - mutex_lock(&of_pci_msi_chip_mutex); - list_del(&chip->list); - mutex_unlock(&of_pci_msi_chip_mutex); -} -EXPORT_SYMBOL_GPL(of_pci_msi_chip_remove); - -struct msi_controller *of_pci_find_msi_chip_by_node(struct device_node *of_node) -{ - struct msi_controller *c; - - mutex_lock(&of_pci_msi_chip_mutex); - list_for_each_entry(c, &of_pci_msi_chip_list, list) { - if (c->of_node == of_node) { - mutex_unlock(&of_pci_msi_chip_mutex); - return c; - } - } - mutex_unlock(&of_pci_msi_chip_mutex); - - return NULL; -} -EXPORT_SYMBOL_GPL(of_pci_find_msi_chip_by_node); - -#endif /* CONFIG_PCI_MSI */ diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index b969e94..569c3f6 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -68,15 +68,4 @@ static inline int of_pci_get_host_bridge_resources(struct device_node *dev, } #endif -#if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI) -int of_pci_msi_chip_add(struct msi_controller *chip); -void of_pci_msi_chip_remove(struct msi_controller *chip); -struct msi_controller *of_pci_find_msi_chip_by_node(struct device_node *of_node); -#else -static inline int of_pci_msi_chip_add(struct msi_controller *chip) { return -EINVAL; } -static inline void of_pci_msi_chip_remove(struct msi_controller *chip) { } -static inline struct msi_controller * -of_pci_find_msi_chip_by_node(struct device_node *of_node) { return NULL; } -#endif - #endif
All the users of the small MSI controller API have been migrated to use the generic MSI infrastructure instead. We no longer need a global chained list of msi_controller. Instead, MSI controllers are now represented as irq domains attached to OF nodes, and the resolution between a device requesting an MSI and the corresponding MSI controller is done by the generic interrupt resolution logic. Therefore, this API is now completely useless, and can be removed from the kernel. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/of/of_pci.c | 45 --------------------------------------------- include/linux/of_pci.h | 11 ----------- 2 files changed, 56 deletions(-)