diff options
-rw-r--r-- | arch/powerpc/platforms/cell/axon_msi.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index aca15007a01c..095988f13bf4 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c | |||
@@ -80,18 +80,13 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val) | |||
80 | dcr_write(msic->dcr_host, dcr_n, val); | 80 | dcr_write(msic->dcr_host, dcr_n, val); |
81 | } | 81 | } |
82 | 82 | ||
83 | static u32 msic_dcr_read(struct axon_msic *msic, unsigned int dcr_n) | ||
84 | { | ||
85 | return dcr_read(msic->dcr_host, dcr_n); | ||
86 | } | ||
87 | |||
88 | static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) | 83 | static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) |
89 | { | 84 | { |
90 | struct axon_msic *msic = get_irq_data(irq); | 85 | struct axon_msic *msic = get_irq_data(irq); |
91 | u32 write_offset, msi; | 86 | u32 write_offset, msi; |
92 | int idx; | 87 | int idx; |
93 | 88 | ||
94 | write_offset = msic_dcr_read(msic, MSIC_WRITE_OFFSET_REG); | 89 | write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG); |
95 | pr_debug("axon_msi: original write_offset 0x%x\n", write_offset); | 90 | pr_debug("axon_msi: original write_offset 0x%x\n", write_offset); |
96 | 91 | ||
97 | /* write_offset doesn't wrap properly, so we have to mask it */ | 92 | /* write_offset doesn't wrap properly, so we have to mask it */ |
@@ -306,7 +301,7 @@ static int axon_msi_notify_reboot(struct notifier_block *nb, | |||
306 | list_for_each_entry(msic, &axon_msic_list, list) { | 301 | list_for_each_entry(msic, &axon_msic_list, list) { |
307 | pr_debug("axon_msi: disabling %s\n", | 302 | pr_debug("axon_msi: disabling %s\n", |
308 | msic->irq_host->of_node->full_name); | 303 | msic->irq_host->of_node->full_name); |
309 | tmp = msic_dcr_read(msic, MSIC_CTRL_REG); | 304 | tmp = dcr_read(msic->dcr_host, MSIC_CTRL_REG); |
310 | tmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE; | 305 | tmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE; |
311 | msic_dcr_write(msic, MSIC_CTRL_REG, tmp); | 306 | msic_dcr_write(msic, MSIC_CTRL_REG, tmp); |
312 | } | 307 | } |