diff options
author | Yijing Wang <wangyijing@huawei.com> | 2014-11-11 19:45:45 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-11-12 09:49:38 -0500 |
commit | c2791b806988100cc1c047e2b0b5c5d0914aa3b6 (patch) | |
tree | fb159818659112e661aafab65e52d4a422360564 /drivers/pci/host/pci-tegra.c | |
parent | f8338694270224970cbaae7e404517ec39f9c753 (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/pci/host/pci-tegra.c')
-rw-r--r-- | drivers/pci/host/pci-tegra.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 3d43874319be..5529de7328ba 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c | |||
@@ -238,7 +238,7 @@ | |||
238 | ) | 238 | ) |
239 | 239 | ||
240 | struct tegra_msi { | 240 | struct tegra_msi { |
241 | struct msi_chip chip; | 241 | struct msi_controller chip; |
242 | DECLARE_BITMAP(used, INT_PCI_MSI_NR); | 242 | DECLARE_BITMAP(used, INT_PCI_MSI_NR); |
243 | struct irq_domain *domain; | 243 | struct irq_domain *domain; |
244 | unsigned long pages; | 244 | unsigned long pages; |
@@ -259,7 +259,7 @@ struct tegra_pcie_soc_data { | |||
259 | bool has_gen2; | 259 | bool has_gen2; |
260 | }; | 260 | }; |
261 | 261 | ||
262 | static inline struct tegra_msi *to_tegra_msi(struct msi_chip *chip) | 262 | static inline struct tegra_msi *to_tegra_msi(struct msi_controller *chip) |
263 | { | 263 | { |
264 | return container_of(chip, struct tegra_msi, chip); | 264 | return container_of(chip, struct tegra_msi, chip); |
265 | } | 265 | } |
@@ -1283,8 +1283,8 @@ static irqreturn_t tegra_pcie_msi_irq(int irq, void *data) | |||
1283 | return processed > 0 ? IRQ_HANDLED : IRQ_NONE; | 1283 | return processed > 0 ? IRQ_HANDLED : IRQ_NONE; |
1284 | } | 1284 | } |
1285 | 1285 | ||
1286 | static int tegra_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, | 1286 | static int tegra_msi_setup_irq(struct msi_controller *chip, |
1287 | struct msi_desc *desc) | 1287 | struct pci_dev *pdev, struct msi_desc *desc) |
1288 | { | 1288 | { |
1289 | struct tegra_msi *msi = to_tegra_msi(chip); | 1289 | struct tegra_msi *msi = to_tegra_msi(chip); |
1290 | struct msi_msg msg; | 1290 | struct msi_msg msg; |
@@ -1313,7 +1313,8 @@ static int tegra_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, | |||
1313 | return 0; | 1313 | return 0; |
1314 | } | 1314 | } |
1315 | 1315 | ||
1316 | static void tegra_msi_teardown_irq(struct msi_chip *chip, unsigned int irq) | 1316 | static void tegra_msi_teardown_irq(struct msi_controller *chip, |
1317 | unsigned int irq) | ||
1317 | { | 1318 | { |
1318 | struct tegra_msi *msi = to_tegra_msi(chip); | 1319 | struct tegra_msi *msi = to_tegra_msi(chip); |
1319 | struct irq_data *d = irq_get_irq_data(irq); | 1320 | struct irq_data *d = irq_get_irq_data(irq); |