lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: Convert 88PM860x driver to new irq_ APIs

Browse Source 
The interrupt controller APIs are being updated to pass a struct irq_data
rather than the interrupt number.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mark Brown
2010-12-11 12:31:31 +00:00
committed by Samuel Ortiz
parent 8d2d3a3a32
commit 49f89d9acb
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/mfd/88pm860x-core.c
View File

@@ -361,12 +361,6 @@ static struct pm860x_irq_data pm860x_irqs[] = {
}, },
}; };
static inline struct pm860x_irq_data *irq_to_pm860x(struct pm860x_chip *chip,
int irq)
{
return &pm860x_irqs[irq - chip->irq_base];
}
static irqreturn_t pm860x_irq(int irq, void *data) static irqreturn_t pm860x_irq(int irq, void *data)
{ {
struct pm860x_chip *chip = data; struct pm860x_chip *chip = data;
@@ -388,16 +382,16 @@ static irqreturn_t pm860x_irq(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void pm860x_irq_lock(unsigned int irq) static void pm860x_irq_lock(struct irq_data *data)
{ {
struct pm860x_chip *chip = get_irq_chip_data(irq); struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
mutex_lock(&chip->irq_lock); mutex_lock(&chip->irq_lock);
} }
static void pm860x_irq_sync_unlock(unsigned int irq) static void pm860x_irq_sync_unlock(struct irq_data *data)
{ {
struct pm860x_chip *chip = get_irq_chip_data(irq); struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
struct pm860x_irq_data *irq_data; struct pm860x_irq_data *irq_data;
struct i2c_client *i2c; struct i2c_client *i2c;
static unsigned char cached[3] = {0x0, 0x0, 0x0}; static unsigned char cached[3] = {0x0, 0x0, 0x0};
@@ -439,25 +433,25 @@ static void pm860x_irq_sync_unlock(unsigned int irq)
mutex_unlock(&chip->irq_lock); mutex_unlock(&chip->irq_lock);
} }
static void pm860x_irq_enable(unsigned int irq) static void pm860x_irq_enable(struct irq_data *data)
{ {
struct pm860x_chip *chip = get_irq_chip_data(irq); struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
pm860x_irqs[irq - chip->irq_base].enable pm860x_irqs[data->irq - chip->irq_base].enable
= pm860x_irqs[irq - chip->irq_base].offs; = pm860x_irqs[data->irq - chip->irq_base].offs;
} }
static void pm860x_irq_disable(unsigned int irq) static void pm860x_irq_disable(struct irq_data *data)
{ {
struct pm860x_chip *chip = get_irq_chip_data(irq); struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
pm860x_irqs[irq - chip->irq_base].enable = 0; pm860x_irqs[data->irq - chip->irq_base].enable = 0;
} }
static struct irq_chip pm860x_irq_chip = { static struct irq_chip pm860x_irq_chip = {
.name = "88pm860x", .name = "88pm860x",
.bus_lock = pm860x_irq_lock, .irq_bus_lock = pm860x_irq_lock,
.bus_sync_unlock = pm860x_irq_sync_unlock, .irq_bus_sync_unlock = pm860x_irq_sync_unlock,
.enable = pm860x_irq_enable, .irq_enable = pm860x_irq_enable,
.disable = pm860x_irq_disable, .irq_disable = pm860x_irq_disable,
}; };
static int __devinit device_gpadc_init(struct pm860x_chip *chip, static int __devinit device_gpadc_init(struct pm860x_chip *chip,