Skip to content

L
linux
Commit fcb8918f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

sh: Convert to new function names 

Scripted with coccinelle.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a821b279
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 65 deletions
arch/sh/boards/board-magicpanelr2.c
View file @ fcb8918f
...@@ -388,12 +388,12 @@ static void __init init_mpr2_IRQ(void) ...@@ -388,12 +388,12 @@ static void __init init_mpr2_IRQ(void)
{ {
plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-5 */ plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-5 */
set_irq_type(32, IRQ_TYPE_LEVEL_LOW); /* IRQ0 CAN1 */ irq_set_irq_type(32, IRQ_TYPE_LEVEL_LOW); /* IRQ0 CAN1 */
set_irq_type(33, IRQ_TYPE_LEVEL_LOW); /* IRQ1 CAN2 */ irq_set_irq_type(33, IRQ_TYPE_LEVEL_LOW); /* IRQ1 CAN2 */
set_irq_type(34, IRQ_TYPE_LEVEL_LOW); /* IRQ2 CAN3 */ irq_set_irq_type(34, IRQ_TYPE_LEVEL_LOW); /* IRQ2 CAN3 */
set_irq_type(35, IRQ_TYPE_LEVEL_LOW); /* IRQ3 SMSC9115 */ irq_set_irq_type(35, IRQ_TYPE_LEVEL_LOW); /* IRQ3 SMSC9115 */
set_irq_type(36, IRQ_TYPE_EDGE_RISING); /* IRQ4 touchscreen */ irq_set_irq_type(36, IRQ_TYPE_EDGE_RISING); /* IRQ4 touchscreen */
set_irq_type(37, IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */ irq_set_irq_type(37, IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */
intc_set_priority(32, 13); /* IRQ0 CAN1 */ intc_set_priority(32, 13); /* IRQ0 CAN1 */
intc_set_priority(33, 13); /* IRQ0 CAN2 */ intc_set_priority(33, 13); /* IRQ0 CAN2 */
......
arch/sh/boards/mach-cayman/irq.c
View file @ fcb8918f
...@@ -149,8 +149,8 @@ void init_cayman_irq(void) ...@@ -149,8 +149,8 @@ void init_cayman_irq(void)
} }
for (i = 0; i < NR_EXT_IRQS; i++) { for (i = 0; i < NR_EXT_IRQS; i++) {
set_irq_chip_and_handler(START_EXT_IRQS + i, &cayman_irq_type, irq_set_chip_and_handler(START_EXT_IRQS + i,
handle_level_irq); &cayman_irq_type, handle_level_irq);
} }
/* Setup the SMSC interrupt */ /* Setup the SMSC interrupt */
......
arch/sh/boards/mach-dreamcast/irq.c
View file @ fcb8918f
...@@ -161,7 +161,6 @@ void systemasic_irq_init(void) ...@@ -161,7 +161,6 @@ void systemasic_irq_init(void)
return; return;
} }
set_irq_chip_and_handler(i, &systemasic_int, irq_set_chip_and_handler(i, &systemasic_int, handle_level_irq);
handle_level_irq);
} }
} }
arch/sh/boards/mach-ecovec24/setup.c
View file @ fcb8918f
...@@ -1102,7 +1102,7 @@ static int __init arch_setup(void) ...@@ -1102,7 +1102,7 @@ static int __init arch_setup(void)
/* enable TouchScreen */ /* enable TouchScreen */
i2c_register_board_info(0, &ts_i2c_clients, 1); i2c_register_board_info(0, &ts_i2c_clients, 1);
set_irq_type(IRQ0, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ0, IRQ_TYPE_LEVEL_LOW);
} }
/* enable CEU0 */ /* enable CEU0 */
......
arch/sh/boards/mach-microdev/irq.c
View file @ fcb8918f
...@@ -117,7 +117,7 @@ static struct irq_chip microdev_irq_type = { ...@@ -117,7 +117,7 @@ static struct irq_chip microdev_irq_type = {
static void __init make_microdev_irq(unsigned int irq) static void __init make_microdev_irq(unsigned int irq)
{ {
disable_irq_nosync(irq); disable_irq_nosync(irq);
set_irq_chip_and_handler(irq, &microdev_irq_type, handle_level_irq); irq_set_chip_and_handler(irq, &microdev_irq_type, handle_level_irq);
disable_microdev_irq(irq_get_irq_data(irq)); disable_microdev_irq(irq_get_irq_data(irq));
} }
......
arch/sh/boards/mach-se/7206/irq.c
View file @ fcb8918f
...@@ -125,7 +125,7 @@ static struct irq_chip se7206_irq_chip __read_mostly = { ...@@ -125,7 +125,7 @@ static struct irq_chip se7206_irq_chip __read_mostly = {
static void make_se7206_irq(unsigned int irq) static void make_se7206_irq(unsigned int irq)
{ {
disable_irq_nosync(irq); disable_irq_nosync(irq);
set_irq_chip_and_handler_name(irq, &se7206_irq_chip, irq_set_chip_and_handler_name(irq, &se7206_irq_chip,
handle_level_irq, "level"); handle_level_irq, "level");
disable_se7206_irq(irq_get_irq_data(irq)); disable_se7206_irq(irq_get_irq_data(irq));
} }
......
arch/sh/boards/mach-se/7343/irq.c
View file @ fcb8918f
...@@ -67,19 +67,20 @@ void __init init_7343se_IRQ(void) ...@@ -67,19 +67,20 @@ void __init init_7343se_IRQ(void)
return; return;
se7343_fpga_irq[i] = irq; se7343_fpga_irq[i] = irq;
set_irq_chip_and_handler_name(se7343_fpga_irq[i], irq_set_chip_and_handler_name(se7343_fpga_irq[i],
&se7343_irq_chip, &se7343_irq_chip,
handle_level_irq, "level"); handle_level_irq,
"level");
set_irq_chip_data(se7343_fpga_irq[i], (void *)i); irq_set_chip_data(se7343_fpga_irq[i], (void *)i);
} }
set_irq_chained_handler(IRQ0_IRQ, se7343_irq_demux); irq_set_chained_handler(IRQ0_IRQ, se7343_irq_demux);
set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
set_irq_chained_handler(IRQ1_IRQ, se7343_irq_demux); irq_set_chained_handler(IRQ1_IRQ, se7343_irq_demux);
set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
set_irq_chained_handler(IRQ4_IRQ, se7343_irq_demux); irq_set_chained_handler(IRQ4_IRQ, se7343_irq_demux);
set_irq_type(IRQ4_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ4_IRQ, IRQ_TYPE_LEVEL_LOW);
set_irq_chained_handler(IRQ5_IRQ, se7343_irq_demux); irq_set_chained_handler(IRQ5_IRQ, se7343_irq_demux);
set_irq_type(IRQ5_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ5_IRQ, IRQ_TYPE_LEVEL_LOW);
} }
arch/sh/boards/mach-se/7722/irq.c
View file @ fcb8918f
...@@ -67,16 +67,17 @@ void __init init_se7722_IRQ(void) ...@@ -67,16 +67,17 @@ void __init init_se7722_IRQ(void)
return; return;
se7722_fpga_irq[i] = irq; se7722_fpga_irq[i] = irq;
set_irq_chip_and_handler_name(se7722_fpga_irq[i], irq_set_chip_and_handler_name(se7722_fpga_irq[i],
&se7722_irq_chip, &se7722_irq_chip,
handle_level_irq, "level"); handle_level_irq,
"level");
set_irq_chip_data(se7722_fpga_irq[i], (void *)i); irq_set_chip_data(se7722_fpga_irq[i], (void *)i);
} }
set_irq_chained_handler(IRQ0_IRQ, se7722_irq_demux); irq_set_chained_handler(IRQ0_IRQ, se7722_irq_demux);
set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
set_irq_chained_handler(IRQ1_IRQ, se7722_irq_demux); irq_set_chained_handler(IRQ1_IRQ, se7722_irq_demux);
set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
} }
arch/sh/boards/mach-se/7724/irq.c
View file @ fcb8918f
...@@ -140,17 +140,16 @@ void __init init_se7724_IRQ(void) ...@@ -140,17 +140,16 @@ void __init init_se7724_IRQ(void)
return; return;
} }
set_irq_chip_and_handler_name(irq, irq_set_chip_and_handler_name(irq, &se7724_irq_chip,
&se7724_irq_chip,
handle_level_irq, "level"); handle_level_irq, "level");
} }
set_irq_chained_handler(IRQ0_IRQ, se7724_irq_demux); irq_set_chained_handler(IRQ0_IRQ, se7724_irq_demux);
set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
set_irq_chained_handler(IRQ1_IRQ, se7724_irq_demux); irq_set_chained_handler(IRQ1_IRQ, se7724_irq_demux);
set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
set_irq_chained_handler(IRQ2_IRQ, se7724_irq_demux); irq_set_chained_handler(IRQ2_IRQ, se7724_irq_demux);
set_irq_type(IRQ2_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(IRQ2_IRQ, IRQ_TYPE_LEVEL_LOW);
} }
arch/sh/boards/mach-x3proto/gpio.c
View file @ fcb8918f
...@@ -102,7 +102,7 @@ int __init x3proto_gpio_setup(void) ...@@ -102,7 +102,7 @@ int __init x3proto_gpio_setup(void)
spin_lock_irqsave(&x3proto_gpio_lock, flags); spin_lock_irqsave(&x3proto_gpio_lock, flags);
x3proto_gpio_irq_map[i] = irq; x3proto_gpio_irq_map[i] = irq;
set_irq_chip_and_handler_name(irq, &dummy_irq_chip, irq_set_chip_and_handler_name(irq, &dummy_irq_chip,
handle_simple_irq, "gpio"); handle_simple_irq, "gpio");
spin_unlock_irqrestore(&x3proto_gpio_lock, flags); spin_unlock_irqrestore(&x3proto_gpio_lock, flags);
} }
...@@ -113,8 +113,8 @@ int __init x3proto_gpio_setup(void) ...@@ -113,8 +113,8 @@ int __init x3proto_gpio_setup(void)
x3proto_gpio_chip.base + x3proto_gpio_chip.ngpio, x3proto_gpio_chip.base + x3proto_gpio_chip.ngpio,
ilsel); ilsel);
set_irq_chained_handler(ilsel, x3proto_gpio_irq_handler); irq_set_chained_handler(ilsel, x3proto_gpio_irq_handler);
set_irq_wake(ilsel, 1); irq_set_irq_wake(ilsel, 1);
return 0; return 0;
......
arch/sh/cchips/hd6446x/hd64461.c
View file @ fcb8918f
...@@ -107,12 +107,12 @@ int __init setup_hd64461(void) ...@@ -107,12 +107,12 @@ int __init setup_hd64461(void)
return -EINVAL; return -EINVAL;
} }
set_irq_chip_and_handler(i, &hd64461_irq_chip, irq_set_chip_and_handler(i, &hd64461_irq_chip,
handle_level_irq); handle_level_irq);
} }
set_irq_chained_handler(CONFIG_HD64461_IRQ, hd64461_irq_demux); irq_set_chained_handler(CONFIG_HD64461_IRQ, hd64461_irq_demux);
set_irq_type(CONFIG_HD64461_IRQ, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(CONFIG_HD64461_IRQ, IRQ_TYPE_LEVEL_LOW);
#ifdef CONFIG_HD64461_ENABLER #ifdef CONFIG_HD64461_ENABLER
printk(KERN_INFO "HD64461: enabling PCMCIA devices\n"); printk(KERN_INFO "HD64461: enabling PCMCIA devices\n");
......
arch/sh/kernel/cpu/irq/imask.c
View file @ fcb8918f
...@@ -80,6 +80,6 @@ static struct irq_chip imask_irq_chip = { ...@@ -80,6 +80,6 @@ static struct irq_chip imask_irq_chip = {
void make_imask_irq(unsigned int irq) void make_imask_irq(unsigned int irq)
{ {
set_irq_chip_and_handler_name(irq, &imask_irq_chip, irq_set_chip_and_handler_name(irq, &imask_irq_chip, handle_level_irq,
handle_level_irq, "level"); "level");
} }
arch/sh/kernel/cpu/irq/intc-sh5.c
View file @ fcb8918f
...@@ -135,7 +135,7 @@ void __init plat_irq_setup(void) ...@@ -135,7 +135,7 @@ void __init plat_irq_setup(void)
/* Set default: per-line enable/disable, priority driven ack/eoi */ /* Set default: per-line enable/disable, priority driven ack/eoi */
for (i = 0; i < NR_INTC_IRQS; i++) for (i = 0; i < NR_INTC_IRQS; i++)
set_irq_chip_and_handler(i, &intc_irq_type, handle_level_irq); irq_set_chip_and_handler(i, &intc_irq_type, handle_level_irq);
/* Disable all interrupts and set all priorities to 0 to avoid trouble */ /* Disable all interrupts and set all priorities to 0 to avoid trouble */
......
arch/sh/kernel/cpu/irq/ipr.c
View file @ fcb8918f
...@@ -74,9 +74,9 @@ void register_ipr_controller(struct ipr_desc *desc) ...@@ -74,9 +74,9 @@ void register_ipr_controller(struct ipr_desc *desc)
} }
disable_irq_nosync(p->irq); disable_irq_nosync(p->irq);
set_irq_chip_and_handler_name(p->irq, &desc->chip, irq_set_chip_and_handler_name(p->irq, &desc->chip,
handle_level_irq, "level"); handle_level_irq, "level");
set_irq_chip_data(p->irq, p); irq_set_chip_data(p->irq, p);
disable_ipr_irq(irq_get_irq_data(p->irq)); disable_ipr_irq(irq_get_irq_data(p->irq));
} }
} }
......
drivers/sh/intc/core.c
View file @ fcb8918f
...@@ -63,7 +63,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level) ...@@ -63,7 +63,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)
static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc) static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc)
{ {
generic_handle_irq((unsigned int)get_irq_data(irq)); generic_handle_irq((unsigned int)irq_get_handler_data(irq));
} }
static void __init intc_register_irq(struct intc_desc *desc, static void __init intc_register_irq(struct intc_desc *desc,
...@@ -116,9 +116,9 @@ static void __init intc_register_irq(struct intc_desc *desc, ...@@ -116,9 +116,9 @@ static void __init intc_register_irq(struct intc_desc *desc,
irq_data = irq_get_irq_data(irq); irq_data = irq_get_irq_data(irq);
disable_irq_nosync(irq); disable_irq_nosync(irq);
set_irq_chip_and_handler_name(irq, &d->chip, irq_set_chip_and_handler_name(irq, &d->chip, handle_level_irq,
handle_level_irq, "level"); "level");
set_irq_chip_data(irq, (void *)data[primary]); irq_set_chip_data(irq, (void *)data[primary]);
/* /*
* set priority level * set priority level
...@@ -340,9 +340,9 @@ int __init register_intc_controller(struct intc_desc *desc) ...@@ -340,9 +340,9 @@ int __init register_intc_controller(struct intc_desc *desc)
vect2->enum_id = 0; vect2->enum_id = 0;
/* redirect this interrupts to the first one */ /* redirect this interrupts to the first one */
set_irq_chip(irq2, &dummy_irq_chip); irq_set_chip(irq2, &dummy_irq_chip);
set_irq_chained_handler(irq2, intc_redirect_irq); irq_set_chained_handler(irq2, intc_redirect_irq);
set_irq_data(irq2, (void *)irq); irq_set_handler_data(irq2, (void *)irq);
} }
} }
......
drivers/sh/intc/virq.c
View file @ fcb8918f
...@@ -110,7 +110,7 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc) ...@@ -110,7 +110,7 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_data *data = irq_get_irq_data(irq); struct irq_data *data = irq_get_irq_data(irq);
struct irq_chip *chip = irq_data_get_irq_chip(data); struct irq_chip *chip = irq_data_get_irq_chip(data);
struct intc_virq_list *entry, *vlist = irq_data_get_irq_data(data); struct intc_virq_list *entry, *vlist = irq_data_get_irq_handler_data(data);
struct intc_desc_int *d = get_intc_desc(irq); struct intc_desc_int *d = get_intc_desc(irq);
chip->irq_mask_ack(data); chip->irq_mask_ack(data);
...@@ -118,7 +118,7 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc) ...@@ -118,7 +118,7 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc)
for_each_virq(entry, vlist) { for_each_virq(entry, vlist) {
unsigned long addr, handle; unsigned long addr, handle;
handle = (unsigned long)get_irq_data(entry->irq); handle = (unsigned long)irq_get_handler_data(entry->irq);
addr = INTC_REG(d, _INTC_ADDR_E(handle), 0); addr = INTC_REG(d, _INTC_ADDR_E(handle), 0);
if (intc_reg_fns[_INTC_FN(handle)](addr, handle, 0)) if (intc_reg_fns[_INTC_FN(handle)](addr, handle, 0))
...@@ -229,13 +229,13 @@ static void __init intc_subgroup_map(struct intc_desc_int *d) ...@@ -229,13 +229,13 @@ static void __init intc_subgroup_map(struct intc_desc_int *d)
intc_irq_xlate_set(irq, entry->enum_id, d); intc_irq_xlate_set(irq, entry->enum_id, d);
set_irq_chip_and_handler_name(irq, get_irq_chip(entry->pirq), irq_set_chip_and_handler_name(irq, irq_get_chip(entry->pirq),
handle_simple_irq, "virq"); handle_simple_irq, "virq");
set_irq_chip_data(irq, get_irq_chip_data(entry->pirq)); irq_set_chip_data(irq, irq_get_chip_data(entry->pirq));
set_irq_data(irq, (void *)entry->handle); irq_set_handler_data(irq, (void *)entry->handle);
set_irq_chained_handler(entry->pirq, intc_virq_handler); irq_set_chained_handler(entry->pirq, intc_virq_handler);
add_virq_to_pirq(entry->pirq, irq); add_virq_to_pirq(entry->pirq, irq);
radix_tree_tag_clear(&d->tree, entry->enum_id, radix_tree_tag_clear(&d->tree, entry->enum_id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7