.. | .. |
---|
302 | 302 | |
---|
303 | 303 | static inline u32 decode_msi_hwirq(struct iproc_msi *msi, u32 eq, u32 head) |
---|
304 | 304 | { |
---|
305 | | - u32 *msg, hwirq; |
---|
| 305 | + u32 __iomem *msg; |
---|
| 306 | + u32 hwirq; |
---|
306 | 307 | unsigned int offs; |
---|
307 | 308 | |
---|
308 | 309 | offs = iproc_msi_eq_offset(msi, eq) + head * sizeof(u32); |
---|
309 | | - msg = (u32 *)(msi->eq_cpu + offs); |
---|
| 310 | + msg = (u32 __iomem *)(msi->eq_cpu + offs); |
---|
310 | 311 | hwirq = readl(msg); |
---|
311 | 312 | hwirq = (hwirq >> 5) + (hwirq & 0x1f); |
---|
312 | 313 | |
---|
.. | .. |
---|
376 | 377 | |
---|
377 | 378 | /* |
---|
378 | 379 | * Now go read the tail pointer again to see if there are new |
---|
379 | | - * oustanding events that came in during the above window. |
---|
| 380 | + * outstanding events that came in during the above window. |
---|
380 | 381 | */ |
---|
381 | 382 | } while (true); |
---|
382 | 383 | |
---|
.. | .. |
---|
614 | 615 | } |
---|
615 | 616 | |
---|
616 | 617 | /* Reserve memory for event queue and make sure memories are zeroed */ |
---|
617 | | - msi->eq_cpu = dma_zalloc_coherent(pcie->dev, |
---|
618 | | - msi->nr_eq_region * EQ_MEM_REGION_SIZE, |
---|
619 | | - &msi->eq_dma, GFP_KERNEL); |
---|
| 618 | + msi->eq_cpu = dma_alloc_coherent(pcie->dev, |
---|
| 619 | + msi->nr_eq_region * EQ_MEM_REGION_SIZE, |
---|
| 620 | + &msi->eq_dma, GFP_KERNEL); |
---|
620 | 621 | if (!msi->eq_cpu) { |
---|
621 | 622 | ret = -ENOMEM; |
---|
622 | 623 | goto free_irqs; |
---|