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 SMTPE driver to new irq_ APIs

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

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Mark Brown and committed by
Samuel Ortiz 43b8c084 2898577e

+14 -14
+14 -14
drivers/mfd/stmpe.c
··· 699 699 return IRQ_HANDLED; 700 700 } 701 701 702 - static void stmpe_irq_lock(unsigned int irq) 702 + static void stmpe_irq_lock(struct irq_data *data) 703 703 { 704 - struct stmpe *stmpe = get_irq_chip_data(irq); 704 + struct stmpe *stmpe = irq_data_get_irq_chip_data(data); 705 705 706 706 mutex_lock(&stmpe->irq_lock); 707 707 } 708 708 709 - static void stmpe_irq_sync_unlock(unsigned int irq) 709 + static void stmpe_irq_sync_unlock(struct irq_data *data) 710 710 { 711 - struct stmpe *stmpe = get_irq_chip_data(irq); 711 + struct stmpe *stmpe = irq_data_get_irq_chip_data(data); 712 712 struct stmpe_variant_info *variant = stmpe->variant; 713 713 int num = DIV_ROUND_UP(variant->num_irqs, 8); 714 714 int i; ··· 727 727 mutex_unlock(&stmpe->irq_lock); 728 728 } 729 729 730 - static void stmpe_irq_mask(unsigned int irq) 730 + static void stmpe_irq_mask(struct irq_data *data) 731 731 { 732 - struct stmpe *stmpe = get_irq_chip_data(irq); 733 - int offset = irq - stmpe->irq_base; 732 + struct stmpe *stmpe = irq_data_get_irq_chip_data(data); 733 + int offset = data->irq - stmpe->irq_base; 734 734 int regoffset = offset / 8; 735 735 int mask = 1 << (offset % 8); 736 736 737 737 stmpe->ier[regoffset] &= ~mask; 738 738 } 739 739 740 - static void stmpe_irq_unmask(unsigned int irq) 740 + static void stmpe_irq_unmask(struct irq_data *data) 741 741 { 742 - struct stmpe *stmpe = get_irq_chip_data(irq); 743 - int offset = irq - stmpe->irq_base; 742 + struct stmpe *stmpe = irq_data_get_irq_chip_data(data); 743 + int offset = data->irq - stmpe->irq_base; 744 744 int regoffset = offset / 8; 745 745 int mask = 1 << (offset % 8); 746 746 ··· 749 749 750 750 static struct irq_chip stmpe_irq_chip = { 751 751 .name = "stmpe", 752 - .bus_lock = stmpe_irq_lock, 753 - .bus_sync_unlock = stmpe_irq_sync_unlock, 754 - .mask = stmpe_irq_mask, 755 - .unmask = stmpe_irq_unmask, 752 + .irq_bus_lock = stmpe_irq_lock, 753 + .irq_bus_sync_unlock = stmpe_irq_sync_unlock, 754 + .irq_mask = stmpe_irq_mask, 755 + .irq_unmask = stmpe_irq_unmask, 756 756 }; 757 757 758 758 static int __devinit stmpe_irq_init(struct stmpe *stmpe)