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

Commit e5cf1528 authored by Yijing Wang's avatar Yijing Wang Committed by Alex Shi
Browse files

PCI/MSI: Rename "struct msi_chip" to "struct msi_controller" 



"msi_chip" isn't very descriptive, so rename it to "msi_controller".  That
tells a little more about what it does and is already used in device tree
bindings.

No functional change.

[bhelgaas: changelog, change *only* the struct name so it's reviewable]
Suggested-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
(cherry picked from commit c2791b806988100cc1c047e2b0b5c5d0914aa3b6)

Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent b1240304

drivers/irqchip/irq-armada-370-xp.c

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void armada_370_xp_free_msi(int hwirq) 
	mutex_unlock(&msi_used_lock);

}



static int armada_370_xp_setup_msi_irq(struct msi_chip *chip,

static int armada_370_xp_setup_msi_irq(struct msi_controller *chip,

				       struct pci_dev *pdev,

				       struct msi_desc *desc)

{
@@ -162,7 +162,7 @@ static int armada_370_xp_setup_msi_irq(struct msi_chip *chip, 
	return 0;

}



static void armada_370_xp_teardown_msi_irq(struct msi_chip *chip,

static void armada_370_xp_teardown_msi_irq(struct msi_controller *chip,

					   unsigned int irq)

{

	struct irq_data *d = irq_get_irq_data(irq);
@@ -197,7 +197,7 @@ static const struct irq_domain_ops armada_370_xp_msi_irq_ops = { 
static int armada_370_xp_msi_init(struct device_node *node,

				  phys_addr_t main_int_phys_base)

{

	struct msi_chip *msi_chip;

	struct msi_controller *msi_chip;

	u32 reg;

	int ret;

drivers/of/of_pci.c

+4 −4
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); 
static LIST_HEAD(of_pci_msi_chip_list);

static DEFINE_MUTEX(of_pci_msi_chip_mutex);



int of_pci_msi_chip_add(struct msi_chip *chip)

int of_pci_msi_chip_add(struct msi_controller *chip)

{

	if (!of_property_read_bool(chip->of_node, "msi-controller"))

		return -EINVAL;
@@ -253,7 +253,7 @@ int of_pci_msi_chip_add(struct msi_chip *chip) 
}

EXPORT_SYMBOL_GPL(of_pci_msi_chip_add);



void of_pci_msi_chip_remove(struct msi_chip *chip)

void of_pci_msi_chip_remove(struct msi_controller *chip)

{

	mutex_lock(&of_pci_msi_chip_mutex);

	list_del(&chip->list);
@@ -261,9 +261,9 @@ void of_pci_msi_chip_remove(struct msi_chip *chip) 
}

EXPORT_SYMBOL_GPL(of_pci_msi_chip_remove);



struct msi_chip *of_pci_find_msi_chip_by_node(struct device_node *of_node)

struct msi_controller *of_pci_find_msi_chip_by_node(struct device_node *of_node)

{

	struct msi_chip *c;

	struct msi_controller *c;



	mutex_lock(&of_pci_msi_chip_mutex);

	list_for_each_entry(c, &of_pci_msi_chip_list, list) {

drivers/pci/host/pci-keystone-dw.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ const struct irq_domain_ops ks_dw_pcie_msi_domain_ops = { 
	.map = ks_dw_pcie_msi_map,

};



int ks_dw_pcie_msi_host_init(struct pcie_port *pp, struct msi_chip *chip)

int ks_dw_pcie_msi_host_init(struct pcie_port *pp, struct msi_controller *chip)

{

	struct keystone_pcie *ks_pcie = to_keystone_pcie(pp);

	int i;

drivers/pci/host/pci-keystone.h

+1 −1
Original line number Diff line number Diff line
@@ -55,4 +55,4 @@ void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq); 
void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq);

void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp);

int ks_dw_pcie_msi_host_init(struct pcie_port *pp,

		struct msi_chip *chip);
 
		struct msi_controller *chip);

drivers/pci/host/pci-mvebu.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct mvebu_pcie_port; 
struct mvebu_pcie {

	struct platform_device *pdev;

	struct mvebu_pcie_port *ports;

	struct msi_chip *msi;

	struct msi_controller *msi;

	struct resource io;

	char io_name[30];

	struct resource realio;