aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/synclink_gt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/synclink_gt.c')
-rw-r--r--drivers/char/synclink_gt.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 1f954acf2bac..3c89266c8255 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -491,7 +491,6 @@ static void isr_serial(struct slgt_info *info);
491static void isr_rdma(struct slgt_info *info); 491static void isr_rdma(struct slgt_info *info);
492static void isr_txeom(struct slgt_info *info, unsigned short status); 492static void isr_txeom(struct slgt_info *info, unsigned short status);
493static void isr_tdma(struct slgt_info *info); 493static void isr_tdma(struct slgt_info *info);
494static irqreturn_t slgt_interrupt(int irq, void *dev_id);
495 494
496static int alloc_dma_bufs(struct slgt_info *info); 495static int alloc_dma_bufs(struct slgt_info *info);
497static void free_dma_bufs(struct slgt_info *info); 496static void free_dma_bufs(struct slgt_info *info);
@@ -2326,17 +2325,13 @@ static void isr_gpio(struct slgt_info *info, unsigned int changed, unsigned int
2326 * irq interrupt number 2325 * irq interrupt number
2327 * dev_id device ID supplied during interrupt registration 2326 * dev_id device ID supplied during interrupt registration
2328 */ 2327 */
2329static irqreturn_t slgt_interrupt(int irq, void *dev_id) 2328static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
2330{ 2329{
2331 struct slgt_info *info; 2330 struct slgt_info *info = dev_id;
2332 unsigned int gsr; 2331 unsigned int gsr;
2333 unsigned int i; 2332 unsigned int i;
2334 2333
2335 DBGISR(("slgt_interrupt irq=%d entry\n", irq)); 2334 DBGISR(("slgt_interrupt irq=%d entry\n", info->irq_level));
2336
2337 info = dev_id;
2338 if (!info)
2339 return IRQ_NONE;
2340 2335
2341 spin_lock(&info->lock); 2336 spin_lock(&info->lock);
2342 2337
@@ -2385,7 +2380,7 @@ static irqreturn_t slgt_interrupt(int irq, void *dev_id)
2385 2380
2386 spin_unlock(&info->lock); 2381 spin_unlock(&info->lock);
2387 2382
2388 DBGISR(("slgt_interrupt irq=%d exit\n", irq)); 2383 DBGISR(("slgt_interrupt irq=%d exit\n", info->irq_level));
2389 return IRQ_HANDLED; 2384 return IRQ_HANDLED;
2390} 2385}
2391 2386