Converted with coccinelle. Signed-off-by: Thomas Gleixner --- drivers/gpio/pl061.c | 4 ++-- drivers/gpio/sx150x.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) Index: linux-2.6-tip/drivers/gpio/pl061.c =================================================================== --- linux-2.6-tip.orig/drivers/gpio/pl061.c +++ linux-2.6-tip/drivers/gpio/pl061.c @@ -315,8 +315,8 @@ static int pl061_probe(struct amba_devic else pl061_direction_input(&chip->gc, i); - irq_set_chip(i + chip->irq_base, &pl061_irqchip); - irq_set_handler(i + chip->irq_base, handle_simple_irq); + irq_set_chip_and_handler(i + chip->irq_base, &pl061_irqchip, + handle_simple_irq); set_irq_flags(i+chip->irq_base, IRQF_VALID); irq_set_chip_data(i + chip->irq_base, chip); } Index: linux-2.6-tip/drivers/gpio/sx150x.c =================================================================== --- linux-2.6-tip.orig/drivers/gpio/sx150x.c +++ linux-2.6-tip/drivers/gpio/sx150x.c @@ -583,8 +583,7 @@ static void sx150x_remove_irq_chip(struc for (n = 0; n < chip->dev_cfg->ngpios; ++n) { irq = chip->irq_base + n; - irq_set_handler(irq, NULL); - irq_set_chip(irq, NULL); + irq_set_chip_and_handler(irq, NULL, NULL); } } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/