platform-drivers: x86: Convert pmic to new irq_chip functions

Old functions will go away soon. Remove the stray semicolons while at
it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Alek Du <alek.du@intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

authored by Thomas Gleixner and committed by Matthew Garrett cb8e5e6a 180e9d19

+8 -14
+8 -14
drivers/platform/x86/intel_pmic_gpio.c
··· 190 190 1 << (offset - 16)); 191 191 } 192 192 193 - static int pmic_irq_type(unsigned irq, unsigned type) 193 + static int pmic_irq_type(struct irq_data *data, unsigned type) 194 194 { 195 - struct pmic_gpio *pg = get_irq_chip_data(irq); 196 - u32 gpio = irq - pg->irq_base; 195 + struct pmic_gpio *pg = irq_data_get_irq_chip_data(data); 196 + u32 gpio = data->irq - pg->irq_base; 197 197 unsigned long flags; 198 198 199 199 if (gpio >= pg->chip.ngpio) ··· 207 207 return 0; 208 208 } 209 209 210 - 211 - 212 210 static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset) 213 211 { 214 212 struct pmic_gpio *pg = container_of(chip, struct pmic_gpio, chip); ··· 215 217 } 216 218 217 219 /* the gpiointr register is read-clear, so just do nothing. */ 218 - static void pmic_irq_unmask(unsigned irq) 219 - { 220 - }; 220 + static void pmic_irq_unmask(struct irq_data *data) { } 221 221 222 - static void pmic_irq_mask(unsigned irq) 223 - { 224 - }; 222 + static void pmic_irq_mask(struct irq_data *data) { } 225 223 226 224 static struct irq_chip pmic_irqchip = { 227 225 .name = "PMIC-GPIO", 228 - .mask = pmic_irq_mask, 229 - .unmask = pmic_irq_unmask, 230 - .set_type = pmic_irq_type, 226 + .irq_mask = pmic_irq_mask, 227 + .irq_unmask = pmic_irq_unmask, 228 + .irq_set_type = pmic_irq_type, 231 229 }; 232 230 233 231 static void pmic_irq_handler(unsigned irq, struct irq_desc *desc)