diff options
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c244x-irq.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c244x-irq.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2440/s3c244x-irq.c b/arch/arm/mach-s3c2440/s3c244x-irq.c index 83daf4ece764..de07c2feaa32 100644 --- a/arch/arm/mach-s3c2440/s3c244x-irq.c +++ b/arch/arm/mach-s3c2440/s3c244x-irq.c | |||
| @@ -95,19 +95,19 @@ static int s3c244x_irq_add(struct sys_device *sysdev) | |||
| 95 | { | 95 | { |
| 96 | unsigned int irqno; | 96 | unsigned int irqno; |
| 97 | 97 | ||
| 98 | set_irq_chip(IRQ_NFCON, &s3c_irq_level_chip); | 98 | irq_set_chip_and_handler(IRQ_NFCON, &s3c_irq_level_chip, |
| 99 | set_irq_handler(IRQ_NFCON, handle_level_irq); | 99 | handle_level_irq); |
| 100 | set_irq_flags(IRQ_NFCON, IRQF_VALID); | 100 | set_irq_flags(IRQ_NFCON, IRQF_VALID); |
| 101 | 101 | ||
| 102 | /* add chained handler for camera */ | 102 | /* add chained handler for camera */ |
| 103 | 103 | ||
| 104 | set_irq_chip(IRQ_CAM, &s3c_irq_level_chip); | 104 | irq_set_chip_and_handler(IRQ_CAM, &s3c_irq_level_chip, |
| 105 | set_irq_handler(IRQ_CAM, handle_level_irq); | 105 | handle_level_irq); |
| 106 | set_irq_chained_handler(IRQ_CAM, s3c_irq_demux_cam); | 106 | irq_set_chained_handler(IRQ_CAM, s3c_irq_demux_cam); |
| 107 | 107 | ||
| 108 | for (irqno = IRQ_S3C2440_CAM_C; irqno <= IRQ_S3C2440_CAM_P; irqno++) { | 108 | for (irqno = IRQ_S3C2440_CAM_C; irqno <= IRQ_S3C2440_CAM_P; irqno++) { |
| 109 | set_irq_chip(irqno, &s3c_irq_cam); | 109 | irq_set_chip_and_handler(irqno, &s3c_irq_cam, |
| 110 | set_irq_handler(irqno, handle_level_irq); | 110 | handle_level_irq); |
| 111 | set_irq_flags(irqno, IRQF_VALID); | 111 | set_irq_flags(irqno, IRQF_VALID); |
| 112 | } | 112 | } |
| 113 | 113 | ||