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

mfd: Convert jz4740-adc to new irq_ methods

Browse source 
Convert the jz4740-adc driver to use the recently introduced IRQ API
variants which are passed struct irq_data rather than an IRQ number.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
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-12 20:08:30 +01:00 • committed by Samuel Ortiz
parent e6a4c4a48a
commit 5af3bde8b2
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
drivers/mfd/jz4740-adc.c
View file

@ -84,31 +84,30 @@ static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq,
spin_unlock_irqrestore(&adc->lock, flags); spin_unlock_irqrestore(&adc->lock, flags);
} }
static void jz4740_adc_irq_mask(unsigned int irq) static void jz4740_adc_irq_mask(struct irq_data *data)
{ {
struct jz4740_adc *adc = get_irq_chip_data(irq); struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
jz4740_adc_irq_set_masked(adc, irq, true); jz4740_adc_irq_set_masked(adc, data->irq, true);
} }
static void jz4740_adc_irq_unmask(unsigned int irq) static void jz4740_adc_irq_unmask(struct irq_data *data)
{ {
struct jz4740_adc *adc = get_irq_chip_data(irq); struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
jz4740_adc_irq_set_masked(adc, irq, false); jz4740_adc_irq_set_masked(adc, data->irq, false);
} }
static void jz4740_adc_irq_ack(unsigned int irq) static void jz4740_adc_irq_ack(struct irq_data *data)
{ {
struct jz4740_adc *adc = get_irq_chip_data(irq); struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
unsigned int irq = data->irq - adc->irq_base;
irq -= adc->irq_base;
writeb(BIT(irq), adc->base + JZ_REG_ADC_STATUS); writeb(BIT(irq), adc->base + JZ_REG_ADC_STATUS);
} }
static struct irq_chip jz4740_adc_irq_chip = { static struct irq_chip jz4740_adc_irq_chip = {
.name = "jz4740-adc", .name = "jz4740-adc",
.mask = jz4740_adc_irq_mask, .irq_mask = jz4740_adc_irq_mask,
.unmask = jz4740_adc_irq_unmask, .irq_unmask = jz4740_adc_irq_unmask,
.ack = jz4740_adc_irq_ack, .irq_ack = jz4740_adc_irq_ack,
}; };
static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc) static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc)