1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 0902ec041c7a..54fbab95b88c 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -4041,9 +4041,6 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
 
         btv=(struct bttv *)dev_id;
 
-        if (btv->custom_irq)
-                handled = btv->custom_irq(btv);
-
         count=0;
         while (1) {
                 /* get/clear interrupt status bits */
@@ -4079,7 +4076,6 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
                         btv->field_count++;
 
                 if ((astat & BT848_INT_GPINT) && btv->remote) {
-                        wake_up(&btv->gpioq);
                         bttv_input_irq(btv);
                 }
 
@@ -4284,7 +4280,6 @@ static int __devinit bttv_probe(struct pci_dev *dev,
         mutex_init(&btv->lock);
         spin_lock_init(&btv->s_lock);
         spin_lock_init(&btv->gpio_lock);
-        init_waitqueue_head(&btv->gpioq);
         init_waitqueue_head(&btv->i2c_queue);
         INIT_LIST_HEAD(&btv->c.subs);
         INIT_LIST_HEAD(&btv->capture);
@@ -4472,7 +4467,6 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
 
         /* tell gpio modules we are leaving ... */
         btv->shutdown=1;
-        wake_up(&btv->gpioq);
         bttv_input_fini(btv);
         bttv_sub_del_devices(&btv->c);