aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2014-11-11 19:45:45 -0500
committerBjorn Helgaas <bhelgaas@google.com>2014-11-12 09:49:38 -0500
commitc2791b806988100cc1c047e2b0b5c5d0914aa3b6 (patch)
treefb159818659112e661aafab65e52d4a422360564 /drivers/irqchip
parentf8338694270224970cbaae7e404517ec39f9c753 (diff)
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>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-armada-370-xp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 3e238cd049e6..4e202375e027 100644
--- 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)
129 mutex_unlock(&msi_used_lock); 129 mutex_unlock(&msi_used_lock);
130} 130}
131 131
132static int armada_370_xp_setup_msi_irq(struct msi_chip *chip, 132static int armada_370_xp_setup_msi_irq(struct msi_controller *chip,
133 struct pci_dev *pdev, 133 struct pci_dev *pdev,
134 struct msi_desc *desc) 134 struct msi_desc *desc)
135{ 135{
@@ -160,7 +160,7 @@ static int armada_370_xp_setup_msi_irq(struct msi_chip *chip,
160 return 0; 160 return 0;
161} 161}
162 162
163static void armada_370_xp_teardown_msi_irq(struct msi_chip *chip, 163static void armada_370_xp_teardown_msi_irq(struct msi_controller *chip,
164 unsigned int irq) 164 unsigned int irq)
165{ 165{
166 struct irq_data *d = irq_get_irq_data(irq); 166 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 = {
195static int armada_370_xp_msi_init(struct device_node *node, 195static int armada_370_xp_msi_init(struct device_node *node,
196 phys_addr_t main_int_phys_base) 196 phys_addr_t main_int_phys_base)
197{ 197{
198 struct msi_chip *msi_chip; 198 struct msi_controller *msi_chip;
199 u32 reg; 199 u32 reg;
200 int ret; 200 int ret;
201 201