From 3e42d9776e374d937ad62d9a88baa03a2a68afc8 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 24 Mar 2011 21:27:37 +0000 Subject: [PATCH] --- yaml --- r: 242552 b: refs/heads/master c: 08f1b807355c8d355885a71e7fd462fe9d499411 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpio/pl061.c | 4 ++-- trunk/drivers/gpio/sx150x.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 337171b214e6..ea3c07d51451 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b51804bcf0774a8bc6af1e8bb6ae818f4b71173a +refs/heads/master: 08f1b807355c8d355885a71e7fd462fe9d499411 diff --git a/trunk/drivers/gpio/pl061.c b/trunk/drivers/gpio/pl061.c index 901e4e06b377..6fcb28cdd862 100644 --- a/trunk/drivers/gpio/pl061.c +++ b/trunk/drivers/gpio/pl061.c @@ -315,8 +315,8 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id) 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); } diff --git a/trunk/drivers/gpio/sx150x.c b/trunk/drivers/gpio/sx150x.c index 0370ecf63edf..a4f73534394e 100644 --- a/trunk/drivers/gpio/sx150x.c +++ b/trunk/drivers/gpio/sx150x.c @@ -583,8 +583,7 @@ static void sx150x_remove_irq_chip(struct sx150x_chip *chip) 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); } }