mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-26 04:35:01 +00:00
V4L/DVB (5278): Bt8xx/: possible cleanups
This patch contains the following possible cleanups: - remove the following unused global functions: - bttv-if.c: bttv_get_cardinfo() - bttv-if.c: bttv_get_id() - bttv-if.c: bttv_get_gpio_queue() - bttv-if.c: bttv_i2c_call() - remove the following unused EXPORT_SYMBOL's: - bttv-gpio.c: bttv_sub_bus_type - bttv-gpio.c: bttv_gpio_inout - bttv-gpio.c: bttv_gpio_read - bttv-gpio.c: bttv_gpio_write - bttv-gpio.c: bttv_gpio_bits Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
206ebaf327
commit
3bfb7398e2
@ -71,7 +71,6 @@ struct bus_type bttv_sub_bus_type = {
|
||||
.probe = bttv_sub_probe,
|
||||
.remove = bttv_sub_remove,
|
||||
};
|
||||
EXPORT_SYMBOL(bttv_sub_bus_type);
|
||||
|
||||
static void release_sub_device(struct device *dev)
|
||||
{
|
||||
@ -152,7 +151,6 @@ void bttv_gpio_inout(struct bttv_core *core, u32 mask, u32 outbits)
|
||||
btwrite(data,BT848_GPIO_OUT_EN);
|
||||
spin_unlock_irqrestore(&btv->gpio_lock,flags);
|
||||
}
|
||||
EXPORT_SYMBOL(bttv_gpio_inout);
|
||||
|
||||
u32 bttv_gpio_read(struct bttv_core *core)
|
||||
{
|
||||
@ -162,7 +160,6 @@ u32 bttv_gpio_read(struct bttv_core *core)
|
||||
value = btread(BT848_GPIO_DATA);
|
||||
return value;
|
||||
}
|
||||
EXPORT_SYMBOL(bttv_gpio_read);
|
||||
|
||||
void bttv_gpio_write(struct bttv_core *core, u32 value)
|
||||
{
|
||||
@ -170,7 +167,6 @@ void bttv_gpio_write(struct bttv_core *core, u32 value)
|
||||
|
||||
btwrite(value,BT848_GPIO_DATA);
|
||||
}
|
||||
EXPORT_SYMBOL(bttv_gpio_write);
|
||||
|
||||
void bttv_gpio_bits(struct bttv_core *core, u32 mask, u32 bits)
|
||||
{
|
||||
@ -185,7 +181,6 @@ void bttv_gpio_bits(struct bttv_core *core, u32 mask, u32 bits)
|
||||
btwrite(data,BT848_GPIO_DATA);
|
||||
spin_unlock_irqrestore(&btv->gpio_lock,flags);
|
||||
}
|
||||
EXPORT_SYMBOL(bttv_gpio_bits);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
|
@ -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
|
||||
|
@ -260,17 +260,8 @@ extern int bttv_handle_chipset(struct bttv *btv);
|
||||
/* this obsolete -- please use the sysfs-based
|
||||
interface below for new code */
|
||||
|
||||
/* returns card type + card ID (for bt878-based ones)
|
||||
for possible values see lines below beginning with #define BTTV_BOARD_UNKNOWN
|
||||
returns negative value if error occurred
|
||||
*/
|
||||
extern int bttv_get_cardinfo(unsigned int card, int *type,
|
||||
unsigned int *cardid);
|
||||
extern struct pci_dev* bttv_get_pcidev(unsigned int card);
|
||||
|
||||
/* obsolete, use bttv_get_cardinfo instead */
|
||||
extern int bttv_get_id(unsigned int card);
|
||||
|
||||
/* sets GPOE register (BT848_GPIO_OUT_EN) to new value:
|
||||
data | (current_GPOE_value & ~mask)
|
||||
returns negative value if error occurred
|
||||
@ -290,20 +281,6 @@ extern int bttv_read_gpio(unsigned int card, unsigned long *data);
|
||||
extern int bttv_write_gpio(unsigned int card,
|
||||
unsigned long mask, unsigned long data);
|
||||
|
||||
/* returns pointer to task queue which can be used as parameter to
|
||||
interruptible_sleep_on
|
||||
in interrupt handler if BT848_INT_GPINT bit is set - this queue is activated
|
||||
(wake_up_interruptible) and following call to the function bttv_read_gpio
|
||||
should return new value of GPDATA,
|
||||
returns NULL value if error occurred or queue is not available
|
||||
WARNING: because there is no buffer for GPIO data, one MUST
|
||||
process data ASAP
|
||||
*/
|
||||
extern wait_queue_head_t* bttv_get_gpio_queue(unsigned int card);
|
||||
|
||||
/* call i2c clients
|
||||
*/
|
||||
extern void bttv_i2c_call(unsigned int card, unsigned int cmd, void *arg);
|
||||
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user