GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 16:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mfd: Convert SMTPE driver to new irq_ APIs

Browse source 
The genirq core is being updated to supply struct irq_data to irq_chip
operations rather than an irq number. Update the SMTPE driver to the new
APIs.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mark Brown 2010-12-12 12:01:08 +00:00 • committed by Samuel Ortiz
parent 2898577e16
commit 43b8c08402
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/mfd/stmpe.c
View file

@ -699,16 +699,16 @@ static irqreturn_t stmpe_irq(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void stmpe_irq_lock(unsigned int irq) static void stmpe_irq_lock(struct irq_data *data)
{ {
struct stmpe *stmpe = get_irq_chip_data(irq); struct stmpe *stmpe = irq_data_get_irq_chip_data(data);
mutex_lock(&stmpe->irq_lock); mutex_lock(&stmpe->irq_lock);
} }
static void stmpe_irq_sync_unlock(unsigned int irq) static void stmpe_irq_sync_unlock(struct irq_data *data)
{ {
struct stmpe *stmpe = get_irq_chip_data(irq); struct stmpe *stmpe = irq_data_get_irq_chip_data(data);
struct stmpe_variant_info *variant = stmpe->variant; struct stmpe_variant_info *variant = stmpe->variant;
int num = DIV_ROUND_UP(variant->num_irqs, 8); int num = DIV_ROUND_UP(variant->num_irqs, 8);
int i; int i;
@ -727,20 +727,20 @@ static void stmpe_irq_sync_unlock(unsigned int irq)
mutex_unlock(&stmpe->irq_lock); mutex_unlock(&stmpe->irq_lock);
} }
static void stmpe_irq_mask(unsigned int irq) static void stmpe_irq_mask(struct irq_data *data)
{ {
struct stmpe *stmpe = get_irq_chip_data(irq); struct stmpe *stmpe = irq_data_get_irq_chip_data(data);
int offset = irq - stmpe->irq_base; int offset = data->irq - stmpe->irq_base;
int regoffset = offset / 8; int regoffset = offset / 8;
int mask = 1 << (offset % 8); int mask = 1 << (offset % 8);
stmpe->ier[regoffset] &= ~mask; stmpe->ier[regoffset] &= ~mask;
} }
static void stmpe_irq_unmask(unsigned int irq) static void stmpe_irq_unmask(struct irq_data *data)
{ {
struct stmpe *stmpe = get_irq_chip_data(irq); struct stmpe *stmpe = irq_data_get_irq_chip_data(data);
int offset = irq - stmpe->irq_base; int offset = data->irq - stmpe->irq_base;
int regoffset = offset / 8; int regoffset = offset / 8;
int mask = 1 << (offset % 8); int mask = 1 << (offset % 8);
@ -749,10 +749,10 @@ static void stmpe_irq_unmask(unsigned int irq)
static struct irq_chip stmpe_irq_chip = { static struct irq_chip stmpe_irq_chip = {
.name = "stmpe", .name = "stmpe",
.bus_lock = stmpe_irq_lock, .irq_bus_lock = stmpe_irq_lock,
.bus_sync_unlock = stmpe_irq_sync_unlock, .irq_bus_sync_unlock = stmpe_irq_sync_unlock,
.mask = stmpe_irq_mask, .irq_mask = stmpe_irq_mask,
.unmask = stmpe_irq_unmask, .irq_unmask = stmpe_irq_unmask,
}; };
static int __devinit stmpe_irq_init(struct stmpe *stmpe) static int __devinit stmpe_irq_init(struct stmpe *stmpe)