tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
mfd: Convert jz4740-adc to new irq_ methods
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>
authored by
Mark Brown
and committed by
Samuel Ortiz
5af3bde8
e6a4c4a4
+12
-13
+12
-13
drivers/mfd/jz4740-adc.c
+12
-13
drivers/mfd/jz4740-adc.c
···
84
84
spin_unlock_irqrestore(&adc->lock, flags);
85
85
}
86
86
87
-
static void jz4740_adc_irq_mask(unsigned int irq)
87
+
static void jz4740_adc_irq_mask(struct irq_data *data)
88
88
{
89
-
struct jz4740_adc *adc = get_irq_chip_data(irq);
90
-
jz4740_adc_irq_set_masked(adc, irq, true);
89
+
struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
90
+
jz4740_adc_irq_set_masked(adc, data->irq, true);
91
91
}
92
92
93
-
static void jz4740_adc_irq_unmask(unsigned int irq)
93
+
static void jz4740_adc_irq_unmask(struct irq_data *data)
94
94
{
95
-
struct jz4740_adc *adc = get_irq_chip_data(irq);
96
-
jz4740_adc_irq_set_masked(adc, irq, false);
95
+
struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
96
+
jz4740_adc_irq_set_masked(adc, data->irq, false);
97
97
}
98
98
99
-
static void jz4740_adc_irq_ack(unsigned int irq)
99
+
static void jz4740_adc_irq_ack(struct irq_data *data)
100
100
{
101
-
struct jz4740_adc *adc = get_irq_chip_data(irq);
102
-
103
-
irq -= adc->irq_base;
101
+
struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
102
+
unsigned int irq = data->irq - adc->irq_base;
104
103
writeb(BIT(irq), adc->base + JZ_REG_ADC_STATUS);
105
104
}
106
105
107
106
static struct irq_chip jz4740_adc_irq_chip = {
108
107
.name = "jz4740-adc",
109
-
.mask = jz4740_adc_irq_mask,
110
-
.unmask = jz4740_adc_irq_unmask,
111
-
.ack = jz4740_adc_irq_ack,
108
+
.irq_mask = jz4740_adc_irq_mask,
109
+
.irq_unmask = jz4740_adc_irq_unmask,
110
+
.irq_ack = jz4740_adc_irq_ack,
112
111
};
113
112
114
113
static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc)