Merge commit 'v2.6.27-rc6' into timers/hpet

[linux-2.6-omap-h63xx.git] / drivers / media / video / bt8xx / bttv-if.c

diff --git a/drivers/media/video/bt8xx/bttv-if.c b/drivers/media/video/bt8xx/bttv-if.c
index 19b564ab0e92e61fd4b4e5515abaebd02fb924a2..ecf07988cd33ab83c18e7fa4a605b2db3d56d76b 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-if.c
+++ b/drivers/media/video/bt8xx/bttv-if.c
@@ -33,32 +33,16 @@
 
 #include "bttvp.h"
 
-EXPORT_SYMBOL(bttv_get_cardinfo);
 EXPORT_SYMBOL(bttv_get_pcidev);
-EXPORT_SYMBOL(bttv_get_id);
 EXPORT_SYMBOL(bttv_gpio_enable);
 EXPORT_SYMBOL(bttv_read_gpio);
 EXPORT_SYMBOL(bttv_write_gpio);
-EXPORT_SYMBOL(bttv_get_gpio_queue);
-EXPORT_SYMBOL(bttv_i2c_call);
 
 /* ----------------------------------------------------------------------- */
 /* Exported functions - for other modules which want to access the         */
 /*                      gpio ports (IR for example)                        */
 /*                      see bttv.h for comments                            */
 
-int bttv_get_cardinfo(unsigned int card, int *type, unsigned *cardid)
-{
-       printk("The bttv_* interface is obsolete and will go away,\n"
-              "please use the new, sysfs based interface instead.\n");
-       if (card >= bttv_num) {
-               return -1;
-       }
-       *type   = bttvs[card].c.type;
-       *cardid = bttvs[card].cardid;
-       return 0;
-}
-
 struct pci_dev* bttv_get_pcidev(unsigned int card)
 {
        if (card >= bttv_num)
@@ -66,16 +50,6 @@ struct pci_dev* bttv_get_pcidev(unsigned int card)
        return bttvs[card].c.pci;
 }
 
-int bttv_get_id(unsigned int card)
-{
-       printk("The bttv_* interface is obsolete and will go away,\n"
-              "please use the new, sysfs based interface instead.\n");
-       if (card >= bttv_num) {
-               return -1;
-       }
-       return bttvs[card].c.type;
-}
-
 
 int bttv_gpio_enable(unsigned int card, unsigned long mask, unsigned long data)
 {
@@ -130,28 +104,6 @@ int bttv_write_gpio(unsigned int card, unsigned long mask, unsigned long data)
        return 0;
 }
 
-wait_queue_head_t* bttv_get_gpio_queue(unsigned int card)
-{
-       struct bttv *btv;
-
-       if (card >= bttv_num) {
-               return NULL;
-       }
-
-       btv = &bttvs[card];
-       if (bttvs[card].shutdown) {
-               return NULL;
-       }
-       return &btv->gpioq;
-}
-
-void bttv_i2c_call(unsigned int card, unsigned int cmd, void *arg)
-{
-       if (card >= bttv_num)
-               return;
-       bttv_call_i2c_clients(&bttvs[card], cmd, arg);
-}
-
 /*
  * Local variables:
  * c-basic-offset: 8