Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 08:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpio: sx150x: Use irq_data_get_irq_chip_data() at appropriate places

Browse Source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Axel Lin 2012-09-04 22:06:19 +08:00 committed by Linus Walleij
parent a9f77c93ab
commit a3b930815d
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpio/gpio-sx150x.c
View File

@ -311,11 +311,9 @@ static int sx150x_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
static void sx150x_irq_mask(struct irq_data *d) static void sx150x_irq_mask(struct irq_data *d)
{ {
struct irq_chip *ic = irq_data_get_irq_chip(d); struct sx150x_chip *chip = irq_data_get_irq_chip_data(d);
struct sx150x_chip *chip;
unsigned n; unsigned n;
chip = container_of(ic, struct sx150x_chip, irq_chip);
n = d->irq - chip->irq_base; n = d->irq - chip->irq_base;
chip->irq_masked |= (1 << n); chip->irq_masked |= (1 << n);
chip->irq_update = n; chip->irq_update = n;
@ -323,27 +321,22 @@ static void sx150x_irq_mask(struct irq_data *d)
static void sx150x_irq_unmask(struct irq_data *d) static void sx150x_irq_unmask(struct irq_data *d)
{ {
struct irq_chip *ic = irq_data_get_irq_chip(d); struct sx150x_chip *chip = irq_data_get_irq_chip_data(d);
struct sx150x_chip *chip;
unsigned n; unsigned n;
chip = container_of(ic, struct sx150x_chip, irq_chip);
n = d->irq - chip->irq_base; n = d->irq - chip->irq_base;
chip->irq_masked &= ~(1 << n); chip->irq_masked &= ~(1 << n);
chip->irq_update = n; chip->irq_update = n;
} }
static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type) static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type)
{ {
struct irq_chip *ic = irq_data_get_irq_chip(d); struct sx150x_chip *chip = irq_data_get_irq_chip_data(d);
struct sx150x_chip *chip;
unsigned n, val = 0; unsigned n, val = 0;
if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
return -EINVAL; return -EINVAL;
chip = container_of(ic, struct sx150x_chip, irq_chip);
n = d->irq - chip->irq_base; n = d->irq - chip->irq_base;
if (flow_type & IRQ_TYPE_EDGE_RISING) if (flow_type & IRQ_TYPE_EDGE_RISING)
@ -391,22 +384,16 @@ static irqreturn_t sx150x_irq_thread_fn(int irq, void *dev_id)
static void sx150x_irq_bus_lock(struct irq_data *d) static void sx150x_irq_bus_lock(struct irq_data *d)
{ {
struct irq_chip *ic = irq_data_get_irq_chip(d); struct sx150x_chip *chip = irq_data_get_irq_chip_data(d);
struct sx150x_chip *chip;
chip = container_of(ic, struct sx150x_chip, irq_chip);
mutex_lock(&chip->lock); mutex_lock(&chip->lock);
} }
static void sx150x_irq_bus_sync_unlock(struct irq_data *d) static void sx150x_irq_bus_sync_unlock(struct irq_data *d)
{ {
struct irq_chip *ic = irq_data_get_irq_chip(d); struct sx150x_chip *chip = irq_data_get_irq_chip_data(d);
struct sx150x_chip *chip;
unsigned n; unsigned n;
chip = container_of(ic, struct sx150x_chip, irq_chip);
if (chip->irq_update == NO_UPDATE_PENDING) if (chip->irq_update == NO_UPDATE_PENDING)
goto out; goto out;
@ -551,6 +538,7 @@ static int sx150x_install_irq_chip(struct sx150x_chip *chip,
for (n = 0; n < chip->dev_cfg->ngpios; ++n) { for (n = 0; n < chip->dev_cfg->ngpios; ++n) {
irq = irq_base + n; irq = irq_base + n;
irq_set_chip_data(irq, chip);
irq_set_chip_and_handler(irq, &chip->irq_chip, handle_edge_irq); irq_set_chip_and_handler(irq, &chip->irq_chip, handle_edge_irq);
irq_set_nested_thread(irq, 1); irq_set_nested_thread(irq, 1);
#ifdef CONFIG_ARM #ifdef CONFIG_ARM