提交 2ecb899b 编写于 作者: M Michal Simek

microblaze: intc: Change variable name

intr_type is mask - change name.
s/intr_type/intr_mask/g
Signed-off-by: NMichal Simek <monstr@monstr.eu>
上级 5a26cd69
...@@ -99,7 +99,7 @@ unsigned int get_irq(struct pt_regs *regs) ...@@ -99,7 +99,7 @@ unsigned int get_irq(struct pt_regs *regs)
void __init init_IRQ(void) void __init init_IRQ(void)
{ {
u32 i, intr_type; u32 i, intr_mask;
struct device_node *intc = NULL; struct device_node *intc = NULL;
#ifdef CONFIG_SELFMOD_INTC #ifdef CONFIG_SELFMOD_INTC
unsigned int intc_baseaddr = 0; unsigned int intc_baseaddr = 0;
...@@ -122,10 +122,9 @@ void __init init_IRQ(void) ...@@ -122,10 +122,9 @@ void __init init_IRQ(void)
nr_irq = be32_to_cpup(of_get_property(intc, nr_irq = be32_to_cpup(of_get_property(intc,
"xlnx,num-intr-inputs", NULL)); "xlnx,num-intr-inputs", NULL));
intr_type = intr_mask =
be32_to_cpup(of_get_property(intc, be32_to_cpup(of_get_property(intc, "xlnx,kind-of-intr", NULL));
"xlnx,kind-of-intr", NULL)); if (intr_mask > (u32)((1ULL << nr_irq) - 1))
if (intr_type > (u32)((1ULL << nr_irq) - 1))
printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n"); printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");
#ifdef CONFIG_SELFMOD_INTC #ifdef CONFIG_SELFMOD_INTC
...@@ -147,7 +146,7 @@ void __init init_IRQ(void) ...@@ -147,7 +146,7 @@ void __init init_IRQ(void)
out_be32(intc_baseaddr + MER, MER_HIE | MER_ME); out_be32(intc_baseaddr + MER, MER_HIE | MER_ME);
for (i = 0; i < nr_irq; ++i) { for (i = 0; i < nr_irq; ++i) {
if (intr_type & (0x00000001 << i)) { if (intr_mask & (0x00000001 << i)) {
irq_set_chip_and_handler_name(i, &intc_dev, irq_set_chip_and_handler_name(i, &intc_dev,
handle_edge_irq, "edge"); handle_edge_irq, "edge");
irq_clear_status_flags(i, IRQ_LEVEL); irq_clear_status_flags(i, IRQ_LEVEL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册