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

mfd: Convert AB8500 to new irq_ methods

The genirq core is being converted to supply struct irq_data to chips
rather than the interrupt number.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Mark Brown and committed by
Samuel Ortiz 9505a0a0 c91ad349

+14 -14
+14 -14
drivers/mfd/ab8500-core.c
··· 232 232 .startup_irq_enabled = NULL, 233 233 }; 234 234 235 - static void ab8500_irq_lock(unsigned int irq) 235 + static void ab8500_irq_lock(struct irq_data *data) 236 236 { 237 - struct ab8500 *ab8500 = get_irq_chip_data(irq); 237 + struct ab8500 *ab8500 = irq_data_get_irq_chip_data(data); 238 238 239 239 mutex_lock(&ab8500->irq_lock); 240 240 } 241 241 242 - static void ab8500_irq_sync_unlock(unsigned int irq) 242 + static void ab8500_irq_sync_unlock(struct irq_data *data) 243 243 { 244 - struct ab8500 *ab8500 = get_irq_chip_data(irq); 244 + struct ab8500 *ab8500 = irq_data_get_irq_chip_data(data); 245 245 int i; 246 246 247 247 for (i = 0; i < AB8500_NUM_IRQ_REGS; i++) { ··· 261 261 mutex_unlock(&ab8500->irq_lock); 262 262 } 263 263 264 - static void ab8500_irq_mask(unsigned int irq) 264 + static void ab8500_irq_mask(struct irq_data *data) 265 265 { 266 - struct ab8500 *ab8500 = get_irq_chip_data(irq); 267 - int offset = irq - ab8500->irq_base; 266 + struct ab8500 *ab8500 = irq_data_get_irq_chip_data(data); 267 + int offset = data->irq - ab8500->irq_base; 268 268 int index = offset / 8; 269 269 int mask = 1 << (offset % 8); 270 270 271 271 ab8500->mask[index] |= mask; 272 272 } 273 273 274 - static void ab8500_irq_unmask(unsigned int irq) 274 + static void ab8500_irq_unmask(struct irq_data *data) 275 275 { 276 - struct ab8500 *ab8500 = get_irq_chip_data(irq); 277 - int offset = irq - ab8500->irq_base; 276 + struct ab8500 *ab8500 = irq_data_get_irq_chip_data(data); 277 + int offset = data->irq - ab8500->irq_base; 278 278 int index = offset / 8; 279 279 int mask = 1 << (offset % 8); 280 280 ··· 283 283 284 284 static struct irq_chip ab8500_irq_chip = { 285 285 .name = "ab8500", 286 - .bus_lock = ab8500_irq_lock, 287 - .bus_sync_unlock = ab8500_irq_sync_unlock, 288 - .mask = ab8500_irq_mask, 289 - .unmask = ab8500_irq_unmask, 286 + .irq_bus_lock = ab8500_irq_lock, 287 + .irq_bus_sync_unlock = ab8500_irq_sync_unlock, 288 + .irq_mask = ab8500_irq_mask, 289 + .irq_unmask = ab8500_irq_unmask, 290 290 }; 291 291 292 292 static irqreturn_t ab8500_irq(int irq, void *dev)