Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
sh: Updates for irq-flow-type naming changes.
handle_irq_name() and set_irq_chip_and_handler() disappeared,
update for desc->name and set_irq_chip_and_handler_name() use.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
+3
-3
arch/sh/boards/renesas/r7780rp/irq.c
+3
-3
arch/sh/boards/renesas/r7780rp/irq.c
···
33
33
}
34
34
35
35
static struct irq_chip r7780rp_irq_chip __read_mostly = {
36
-
.name = "r7780rp",
36
+
.name = "R7780RP",
37
37
.mask = disable_r7780rp_irq,
38
38
.unmask = enable_r7780rp_irq,
39
39
.mask_ack = disable_r7780rp_irq,
···
48
48
49
49
for (i = 0; i < 15; i++) {
50
50
disable_irq_nosync(i);
51
-
set_irq_chip_and_handler(i, &r7780rp_irq_chip,
52
-
handle_level_irq);
51
+
set_irq_chip_and_handler_name(i, &r7780rp_irq_chip,
52
+
handle_level_irq, "level");
53
53
enable_r7780rp_irq(i);
54
54
}
55
55
}
+3
-2
arch/sh/kernel/cpu/irq/intc2.c
+3
-2
arch/sh/kernel/cpu/irq/intc2.c
···
31
31
}
32
32
33
33
static struct irq_chip intc2_irq_chip = {
34
-
.typename = "intc2",
34
+
.name = "INTC2",
35
35
.mask = disable_intc2_irq,
36
36
.unmask = enable_intc2_irq,
37
37
.mask_ack = disable_intc2_irq,
···
64
64
65
65
local_irq_restore(flags);
66
66
67
-
set_irq_chip_and_handler(p->irq, &intc2_irq_chip, handle_level_irq);
67
+
set_irq_chip_and_handler_name(p->irq, &intc2_irq_chip,
68
+
handle_level_irq, "level");
68
69
set_irq_chip_data(p->irq, p);
69
70
70
71
enable_intc2_irq(p->irq);
+3
-2
arch/sh/kernel/cpu/irq/ipr.c
+3
-2
arch/sh/kernel/cpu/irq/ipr.c
···
44
44
}
45
45
46
46
static struct irq_chip ipr_irq_chip = {
47
-
.name = "ipr",
47
+
.name = "IPR",
48
48
.mask = disable_ipr_irq,
49
49
.unmask = enable_ipr_irq,
50
50
.mask_ack = disable_ipr_irq,
···
60
60
ipr_data.shift = pos*4; /* POSition (0-3) x 4 means shift */
61
61
ipr_data.priority = priority;
62
62
63
-
set_irq_chip_and_handler(irq, &ipr_irq_chip, handle_level_irq);
63
+
set_irq_chip_and_handler_name(irq, &ipr_irq_chip,
64
+
handle_level_irq, "level");
64
65
set_irq_chip_data(irq, &ipr_data);
65
66
66
67
enable_ipr_irq(irq);
+1
-1
arch/sh/kernel/irq.c
+1
-1
arch/sh/kernel/irq.c
···
54
54
for_each_online_cpu(j)
55
55
seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
56
56
seq_printf(p, " %14s", irq_desc[i].chip->name);
57
-
seq_printf(p, "-%s", handle_irq_name(irq_desc[i].handle_irq));
57
+
seq_printf(p, "-%-8s", irq_desc[i].name);
58
58
seq_printf(p, " %s", action->name);
59
59
60
60
for (action=action->next; action; action = action->next)