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: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 3e238cd..4e20237 100644 (file)
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -129,7 +129,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)
 {
@@ -160,7 +160,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);
@@ -195,7 +195,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;
 

diff --cc drivers/of/of_pci.c
Simple merge

diff --cc drivers/pci/host/pci-keystone-dw.c
Simple merge

diff --cc drivers/pci/host/pci-keystone.h
Simple merge

diff --cc drivers/pci/host/pci-mvebu.c
Simple merge

diff --cc drivers/pci/host/pci-tegra.c
Simple merge

diff --cc drivers/pci/host/pcie-designware.c
Simple merge

diff --cc drivers/pci/host/pcie-designware.h
Simple merge

diff --cc drivers/pci/host/pcie-rcar.c
Simple merge

diff --cc drivers/pci/host/pcie-xilinx.c
Simple merge

diff --cc drivers/pci/msi.c
Simple merge

diff --cc include/linux/msi.h
Simple merge

diff --cc include/linux/of_pci.h
Simple merge

diff --cc include/linux/pci.h
Simple merge