Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a26356ab authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Bjorn Helgaas
Browse files

of/pci: Remove unused MSI controller helpers 



All 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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
parent 393bf9b3

drivers/of/of_pci.c

+0 −45
Original line number Diff line number Diff line
@@ -285,51 +285,6 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, 
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 */



/**

 * of_pci_map_rid - Translate a requester ID through a downstream mapping.

 * @np: root complex device node.

include/linux/of_pci.h

+0 −11
Original line number Diff line number Diff line
@@ -85,15 +85,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