Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: Convert t7166xb driver to new irq_ API

The genirq core is being updated to pass struct irq_data rather than an
irq number to irq_chip operations. Update the t7166xb driver to the new
APIs.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Mark Brown and committed by
Samuel Ortiz
a4e7fead 43b8c084

+10 -10
+10 -10
drivers/mfd/t7l66xb.c
··· 199 199 generic_handle_irq(irq_base + i); 200 200 } 201 201 202 - static void t7l66xb_irq_mask(unsigned int irq) 202 + static void t7l66xb_irq_mask(struct irq_data *data) 203 203 { 204 - struct t7l66xb *t7l66xb = get_irq_chip_data(irq); 204 + struct t7l66xb *t7l66xb = irq_data_get_irq_chip_data(data); 205 205 unsigned long flags; 206 206 u8 imr; 207 207 208 208 spin_lock_irqsave(&t7l66xb->lock, flags); 209 209 imr = tmio_ioread8(t7l66xb->scr + SCR_IMR); 210 - imr |= 1 << (irq - t7l66xb->irq_base); 210 + imr |= 1 << (data->irq - t7l66xb->irq_base); 211 211 tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR); 212 212 spin_unlock_irqrestore(&t7l66xb->lock, flags); 213 213 } 214 214 215 - static void t7l66xb_irq_unmask(unsigned int irq) 215 + static void t7l66xb_irq_unmask(struct irq_data *data) 216 216 { 217 - struct t7l66xb *t7l66xb = get_irq_chip_data(irq); 217 + struct t7l66xb *t7l66xb = irq_data_get_irq_chip_data(data); 218 218 unsigned long flags; 219 219 u8 imr; 220 220 221 221 spin_lock_irqsave(&t7l66xb->lock, flags); 222 222 imr = tmio_ioread8(t7l66xb->scr + SCR_IMR); 223 - imr &= ~(1 << (irq - t7l66xb->irq_base)); 223 + imr &= ~(1 << (data->irq - t7l66xb->irq_base)); 224 224 tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR); 225 225 spin_unlock_irqrestore(&t7l66xb->lock, flags); 226 226 } 227 227 228 228 static struct irq_chip t7l66xb_chip = { 229 - .name = "t7l66xb", 230 - .ack = t7l66xb_irq_mask, 231 - .mask = t7l66xb_irq_mask, 232 - .unmask = t7l66xb_irq_unmask, 229 + .name = "t7l66xb", 230 + .irq_ack = t7l66xb_irq_mask, 231 + .irq_mask = t7l66xb_irq_mask, 232 + .irq_unmask = t7l66xb_irq_unmask, 233 233 }; 234 234 235 235 /*--------------------------------------------------------------------------*/