frv: Convert mb93093 irq_chip to new function

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

authored by Thomas Gleixner and committed by David Howells 9148d88b 193e7a5f

+13 -13
+13 -13
arch/frv/kernel/irq-mb93093.c
··· 35 /* 36 * off-CPU FPGA PIC operations 37 */ 38 - static void frv_fpga_mask(unsigned int irq) 39 { 40 uint16_t imr = __get_IMR(); 41 42 - imr |= 1 << (irq - IRQ_BASE_FPGA); 43 __set_IMR(imr); 44 } 45 46 - static void frv_fpga_ack(unsigned int irq) 47 { 48 - __clr_IFR(1 << (irq - IRQ_BASE_FPGA)); 49 } 50 51 - static void frv_fpga_mask_ack(unsigned int irq) 52 { 53 uint16_t imr = __get_IMR(); 54 55 - imr |= 1 << (irq - IRQ_BASE_FPGA); 56 __set_IMR(imr); 57 58 - __clr_IFR(1 << (irq - IRQ_BASE_FPGA)); 59 } 60 61 - static void frv_fpga_unmask(unsigned int irq) 62 { 63 uint16_t imr = __get_IMR(); 64 65 - imr &= ~(1 << (irq - IRQ_BASE_FPGA)); 66 67 __set_IMR(imr); 68 } 69 70 static struct irq_chip frv_fpga_pic = { 71 .name = "mb93093", 72 - .ack = frv_fpga_ack, 73 - .mask = frv_fpga_mask, 74 - .mask_ack = frv_fpga_mask_ack, 75 - .unmask = frv_fpga_unmask, 76 }; 77 78 /*
··· 35 /* 36 * off-CPU FPGA PIC operations 37 */ 38 + static void frv_fpga_mask(struct irq_data *d) 39 { 40 uint16_t imr = __get_IMR(); 41 42 + imr |= 1 << (d->irq - IRQ_BASE_FPGA); 43 __set_IMR(imr); 44 } 45 46 + static void frv_fpga_ack(struct irq_data *d) 47 { 48 + __clr_IFR(1 << (d->irq - IRQ_BASE_FPGA)); 49 } 50 51 + static void frv_fpga_mask_ack(struct irq_data *d) 52 { 53 uint16_t imr = __get_IMR(); 54 55 + imr |= 1 << (d->irq - IRQ_BASE_FPGA); 56 __set_IMR(imr); 57 58 + __clr_IFR(1 << (d->irq - IRQ_BASE_FPGA)); 59 } 60 61 + static void frv_fpga_unmask(struct irq_data *d) 62 { 63 uint16_t imr = __get_IMR(); 64 65 + imr &= ~(1 << (d->irq - IRQ_BASE_FPGA)); 66 67 __set_IMR(imr); 68 } 69 70 static struct irq_chip frv_fpga_pic = { 71 .name = "mb93093", 72 + .irq_ack = frv_fpga_ack, 73 + .irq_mask = frv_fpga_mask, 74 + .irq_mask_ack = frv_fpga_mask_ack, 75 + .irq_unmask = frv_fpga_unmask, 76 }; 77 78 /*