]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
staging: dt3155v4l: remove irq_handler from struct dt3155_priv
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 7 Sep 2011 21:37:59 +0000 (14:37 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 9 Sep 2011 20:33:19 +0000 (13:33 -0700)
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>
drivers/staging/dt3155v4l/dt3155v4l.c
drivers/staging/dt3155v4l/dt3155v4l.h

index 421df438e707fbeb5e87ae624fa1a54df6c58651..05b6a2a31ac07145deb25901cc0c62fef66f885d 100644 (file)
@@ -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;
index c064ebac31898e0c20b2a21c8ac6101ceb5e6903..2e4f89d402e4f93986fca3a3ab27cd442bab7567 100644 (file)
@@ -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;