diff options
-rw-r--r-- | arch/powerpc/sysdev/fsl_msi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index 077776c06cd0..067cc88ae376 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c | |||
@@ -110,7 +110,7 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev) | |||
110 | list_for_each_entry(entry, &pdev->msi_list, list) { | 110 | list_for_each_entry(entry, &pdev->msi_list, list) { |
111 | if (entry->irq == NO_IRQ) | 111 | if (entry->irq == NO_IRQ) |
112 | continue; | 112 | continue; |
113 | msi_data = irq_get_handler_data(entry->irq); | 113 | msi_data = irq_get_chip_data(entry->irq); |
114 | irq_set_msi_desc(entry->irq, NULL); | 114 | irq_set_msi_desc(entry->irq, NULL); |
115 | msi_bitmap_free_hwirqs(&msi_data->bitmap, | 115 | msi_bitmap_free_hwirqs(&msi_data->bitmap, |
116 | virq_to_hw(entry->irq), 1); | 116 | virq_to_hw(entry->irq), 1); |
@@ -168,7 +168,7 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) | |||
168 | rc = -ENOSPC; | 168 | rc = -ENOSPC; |
169 | goto out_free; | 169 | goto out_free; |
170 | } | 170 | } |
171 | irq_set_handler_data(virq, msi_data); | 171 | /* chip_data is msi_data via host->hostdata in host->map() */ |
172 | irq_set_msi_desc(virq, entry); | 172 | irq_set_msi_desc(virq, entry); |
173 | 173 | ||
174 | fsl_compose_msi_msg(pdev, hwirq, &msg, msi_data); | 174 | fsl_compose_msi_msg(pdev, hwirq, &msg, msi_data); |
@@ -193,7 +193,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
193 | u32 have_shift = 0; | 193 | u32 have_shift = 0; |
194 | struct fsl_msi_cascade_data *cascade_data; | 194 | struct fsl_msi_cascade_data *cascade_data; |
195 | 195 | ||
196 | cascade_data = (struct fsl_msi_cascade_data *)irq_get_handler_data(irq); | 196 | cascade_data = irq_get_handler_data(irq); |
197 | msi_data = cascade_data->msi_data; | 197 | msi_data = cascade_data->msi_data; |
198 | 198 | ||
199 | raw_spin_lock(&desc->lock); | 199 | raw_spin_lock(&desc->lock); |