diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2011-09-07 14:37:59 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-09 13:33:19 -0700 |
commit | 170786474a6e6005f865327960da1f534b67ee84 (patch) | |
tree | bd0453a9816be8a027e040280d491d13dc29c20b | |
parent | f748b65bfc8cabdf50f1a6934a9cd43f173f2264 (diff) | |
download | linux-170786474a6e6005f865327960da1f534b67ee84.tar.bz2 |
staging: dt3155v4l: remove irq_handler from struct dt3155_priv
There is no reason to cache the irq_handler in struct dt3155_priv. Just pass
the function directly in request_irq.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/dt3155v4l/dt3155v4l.c | 3 | ||||
-rw-r--r-- | drivers/staging/dt3155v4l/dt3155v4l.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/dt3155v4l/dt3155v4l.c b/drivers/staging/dt3155v4l/dt3155v4l.c index 421df438e707..05b6a2a31ac0 100644 --- a/drivers/staging/dt3155v4l/dt3155v4l.c +++ b/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/drivers/staging/dt3155v4l/dt3155v4l.h b/drivers/staging/dt3155v4l/dt3155v4l.h index c064ebac3189..2e4f89d402e4 100644 --- a/drivers/staging/dt3155v4l/dt3155v4l.h +++ b/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; |