| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20101213120305.GG15575@mail.wantstofly.org>
Date: Mon, 13 Dec 2010 13:03:05 +0100
From: Lennert Buytenhek <buytenh@...tstofly.org>
To: Rabin Vincent <rabin.vincent@...ricsson.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH 08/10] gpio: tc35892-gpio: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@...retlab.ca>
---
drivers/gpio/tc35892-gpio.c | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/gpio/tc35892-gpio.c b/drivers/gpio/tc35892-gpio.c
index 7e10c93..867e44b 100644
--- a/drivers/gpio/tc35892-gpio.c
+++ b/drivers/gpio/tc35892-gpio.c
@@ -110,10 +110,10 @@ static struct gpio_chip template_chip = {
.can_sleep = 1,
};
-static int tc35892_gpio_irq_set_type(unsigned int irq, unsigned int type)
+static int tc35892_gpio_irq_set_type(struct irq_data *d, unsigned int type)
{
- struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
- int offset = irq - tc35892_gpio->irq_base;
+ struct tc35892_gpio *tc35892_gpio = irq_data_get_irq_chip_data(d);
+ int offset = d->irq - tc35892_gpio->irq_base;
int regoffset = offset / 8;
int mask = 1 << (offset % 8);
@@ -137,16 +137,16 @@ static int tc35892_gpio_irq_set_type(unsigned int irq, unsigned int type)
return 0;
}
-static void tc35892_gpio_irq_lock(unsigned int irq)
+static void tc35892_gpio_irq_lock(struct irq_data *d)
{
- struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
+ struct tc35892_gpio *tc35892_gpio = irq_data_get_irq_chip_data(d);
mutex_lock(&tc35892_gpio->irq_lock);
}
-static void tc35892_gpio_irq_sync_unlock(unsigned int irq)
+static void tc35892_gpio_irq_sync_unlock(struct irq_data *d)
{
- struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
+ struct tc35892_gpio *tc35892_gpio = irq_data_get_irq_chip_data(d);
struct tc35892 *tc35892 = tc35892_gpio->tc35892;
static const u8 regmap[] = {
[REG_IBE] = TC35892_GPIOIBE0,
@@ -172,20 +172,20 @@ static void tc35892_gpio_irq_sync_unlock(unsigned int irq)
mutex_unlock(&tc35892_gpio->irq_lock);
}
-static void tc35892_gpio_irq_mask(unsigned int irq)
+static void tc35892_gpio_irq_mask(struct irq_data *d)
{
- struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
- int offset = irq - tc35892_gpio->irq_base;
+ struct tc35892_gpio *tc35892_gpio = irq_data_get_irq_chip_data(d);
+ int offset = d->irq - tc35892_gpio->irq_base;
int regoffset = offset / 8;
int mask = 1 << (offset % 8);
tc35892_gpio->regs[REG_IE][regoffset] &= ~mask;
}
-static void tc35892_gpio_irq_unmask(unsigned int irq)
+static void tc35892_gpio_irq_unmask(struct irq_data *d)
{
- struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
- int offset = irq - tc35892_gpio->irq_base;
+ struct tc35892_gpio *tc35892_gpio = irq_data_get_irq_chip_data(d);
+ int offset = d->irq - tc35892_gpio->irq_base;
int regoffset = offset / 8;
int mask = 1 << (offset % 8);
@@ -194,11 +194,11 @@ static void tc35892_gpio_irq_unmask(unsigned int irq)
static struct irq_chip tc35892_gpio_irq_chip = {
.name = "tc35892-gpio",
- .bus_lock = tc35892_gpio_irq_lock,
- .bus_sync_unlock = tc35892_gpio_irq_sync_unlock,
- .mask = tc35892_gpio_irq_mask,
- .unmask = tc35892_gpio_irq_unmask,
- .set_type = tc35892_gpio_irq_set_type,
+ .irq_bus_lock = tc35892_gpio_irq_lock,
+ .irq_bus_sync_unlock = tc35892_gpio_irq_sync_unlock,
+ .irq_mask = tc35892_gpio_irq_mask,
+ .irq_unmask = tc35892_gpio_irq_unmask,
+ .irq_set_type = tc35892_gpio_irq_set_type,
};
static irqreturn_t tc35892_gpio_irq(int irq, void *dev)
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists