From 9bce151fc77f5afade65d07b5c5efd08a3465082 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 7 Sep 2011 14:37:59 -0700 Subject: [PATCH] --- yaml --- r: 268316 b: refs/heads/master c: 170786474a6e6005f865327960da1f534b67ee84 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/dt3155v4l/dt3155v4l.c | 3 +-- trunk/drivers/staging/dt3155v4l/dt3155v4l.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8621a18902e2..61956f830f4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f748b65bfc8cabdf50f1a6934a9cd43f173f2264 +refs/heads/master: 170786474a6e6005f865327960da1f534b67ee84 diff --git a/trunk/drivers/staging/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/dt3155v4l/dt3155v4l.c index 421df438e707..05b6a2a31ac0 100644 --- a/trunk/drivers/staging/dt3155v4l/dt3155v4l.c +++ b/trunk/drivers/staging/dt3155v4l/dt3155v4l.c @@ -406,8 +406,7 @@ dt3155_open(struct file *filp) /* disable all irqs, clear all irq flags */ iowrite32(FLD_START | FLD_END_EVEN | FLD_END_ODD, pd->regs + INT_CSR); - pd->irq_handler = dt3155_irq_handler_even; - ret = request_irq(pd->pdev->irq, pd->irq_handler, + ret = request_irq(pd->pdev->irq, dt3155_irq_handler_even, IRQF_SHARED, DT3155_NAME, pd); if (ret) goto err_request_irq; diff --git a/trunk/drivers/staging/dt3155v4l/dt3155v4l.h b/trunk/drivers/staging/dt3155v4l/dt3155v4l.h index c064ebac3189..2e4f89d402e4 100644 --- a/trunk/drivers/staging/dt3155v4l/dt3155v4l.h +++ b/trunk/drivers/staging/dt3155v4l/dt3155v4l.h @@ -183,7 +183,6 @@ struct dt3155_stats { * @q pointer to vb2_queue structure * @curr_buf: pointer to curren buffer * @mux: mutex to protect the instance - * @irq_handler: irq handler for the driver * @dmaq queue for dma buffers * @lock spinlock for dma queue * @field_count fields counter @@ -199,7 +198,6 @@ struct dt3155_priv { struct vb2_queue *q; struct vb2_buffer *curr_buf; struct mutex mux; - irq_handler_t irq_handler; struct list_head dmaq; spinlock_t lock; unsigned int field_count;