From 946c7db45fd17a009a91930faf391e980c4e5bbb Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 22 Mar 2011 17:11:09 +0100 Subject: [PATCH] --- yaml --- r: 243273 b: refs/heads/master c: 1475b85d08b51b5ee2b7b426247d3ef3f531eafe h: refs/heads/master i: 243271: 9fb75ea0488d8964b5d1e3bd5d14b43d0b9f9f79 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/gpio.c | 2 +- trunk/arch/arm/mach-tegra/gpio.c | 2 +- trunk/arch/arm/plat-omap/gpio.c | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e7cd40efb23c..e35f68ede80a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0f18edaf6ee4e6fac89cae63a90bd38ad2a3418 +refs/heads/master: 1475b85d08b51b5ee2b7b426247d3ef3f531eafe diff --git a/trunk/arch/arm/mach-at91/gpio.c b/trunk/arch/arm/mach-at91/gpio.c index af818a21587c..5abcfc016c47 100644 --- a/trunk/arch/arm/mach-at91/gpio.c +++ b/trunk/arch/arm/mach-at91/gpio.c @@ -518,7 +518,7 @@ void __init at91_gpio_irq_setup(void) __raw_writel(~0, this->regbase + PIO_IDR); for (i = 0, pin = this->chip.base; i < 32; i++, pin++) { - lockdep_set_class(&irq_desc[pin].lock, &gpio_lock_class); + irq_set_lockdep_class(pin, &gpio_lock_class); /* * Can use the "simple" and not "edge" handler since it's diff --git a/trunk/arch/arm/mach-tegra/gpio.c b/trunk/arch/arm/mach-tegra/gpio.c index 094e61a59b1f..8ab2131f41d4 100644 --- a/trunk/arch/arm/mach-tegra/gpio.c +++ b/trunk/arch/arm/mach-tegra/gpio.c @@ -340,7 +340,7 @@ static int __init tegra_gpio_init(void) for (i = INT_GPIO_BASE; i < (INT_GPIO_BASE + TEGRA_NR_GPIOS); i++) { bank = &tegra_gpio_banks[GPIO_BANK(irq_to_gpio(i))]; - lockdep_set_class(&irq_desc[i].lock, &gpio_lock_class); + irq_set_lockdep_class(i, &gpio_lock_class); set_irq_chip_data(i, bank); set_irq_chip(i, &tegra_gpio_irq_chip); set_irq_handler(i, handle_simple_irq); diff --git a/trunk/arch/arm/plat-omap/gpio.c b/trunk/arch/arm/plat-omap/gpio.c index 971d18636942..08af18883e26 100644 --- a/trunk/arch/arm/plat-omap/gpio.c +++ b/trunk/arch/arm/plat-omap/gpio.c @@ -1672,9 +1672,7 @@ static void __init omap_gpio_chip_init(struct gpio_bank *bank) for (j = bank->virtual_irq_start; j < bank->virtual_irq_start + bank_width; j++) { - struct irq_desc *d = irq_to_desc(j); - - lockdep_set_class(&d->lock, &gpio_lock_class); + irq_set_lockdep_class(j, &gpio_lock_class); set_irq_chip_data(j, bank); if (bank_is_mpuio(bank)) set_irq_chip(j, &mpuio_irq_chip);