frv: Convert mb93091 irq_chip to new functions

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

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