dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

V4L/DVB (4959): Usbvision: possible cleanups 

This patch contains the following possible cleanups:
- make needlessly global functions static
- remove the unused EXPORT_SYMBOL's

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Adrian Bunk 2006-12-11 15:51:36 -03:00 committed by Mauro Carvalho Chehab
parent bee8a44ecb
commit 0a0ceadebd
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/media/video/usbvision/usbvision-core.c
View File

@ -118,7 +118,7 @@ static int usbvision_measure_bandwidth (struct usb_usbvision *usbvision);
* This is used when initializing the contents of the area. * This is used when initializing the contents of the area.
*/ */
void *usbvision_rvmalloc(unsigned long size) static void *usbvision_rvmalloc(unsigned long size)
{ {
void *mem; void *mem;
unsigned long adr; unsigned long adr;
@ -181,7 +181,7 @@ static void usbvision_hexdump(const unsigned char *data, int len)
/******************************** /********************************
* scratch ring buffer handling * scratch ring buffer handling
********************************/ ********************************/
int scratch_len(struct usb_usbvision *usbvision) /*This returns the amount of data actually in the buffer */ static int scratch_len(struct usb_usbvision *usbvision) /*This returns the amount of data actually in the buffer */
{ {
int len = usbvision->scratch_write_ptr - usbvision->scratch_read_ptr; int len = usbvision->scratch_write_ptr - usbvision->scratch_read_ptr;
if (len < 0) { if (len < 0) {
@ -194,7 +194,7 @@ int scratch_len(struct usb_usbvision *usbvision) /*This returns the amount of
/* This returns the free space left in the buffer */ /* This returns the free space left in the buffer */
int scratch_free(struct usb_usbvision *usbvision) static int scratch_free(struct usb_usbvision *usbvision)
{ {
int free = usbvision->scratch_read_ptr - usbvision->scratch_write_ptr; int free = usbvision->scratch_read_ptr - usbvision->scratch_write_ptr;
if (free <= 0) { if (free <= 0) {
@ -211,7 +211,8 @@ int scratch_free(struct usb_usbvision *usbvision)
/* This puts data into the buffer */ /* This puts data into the buffer */
int scratch_put(struct usb_usbvision *usbvision, unsigned char *data, int len) static int scratch_put(struct usb_usbvision *usbvision, unsigned char *data,
int len)
{ {
int len_part; int len_part;
@ -237,7 +238,7 @@ int scratch_put(struct usb_usbvision *usbvision, unsigned char *data, int len)
} }
/* This marks the write_ptr as position of new frame header */ /* This marks the write_ptr as position of new frame header */
void scratch_mark_header(struct usb_usbvision *usbvision) static void scratch_mark_header(struct usb_usbvision *usbvision)
{ {
PDEBUG(DBG_SCRATCH, "header at write_ptr=%d\n", usbvision->scratch_headermarker_write_ptr); PDEBUG(DBG_SCRATCH, "header at write_ptr=%d\n", usbvision->scratch_headermarker_write_ptr);
@ -248,7 +249,8 @@ void scratch_mark_header(struct usb_usbvision *usbvision)
} }
/* This gets data from the buffer at the given "ptr" position */ /* This gets data from the buffer at the given "ptr" position */
int scratch_get_extra(struct usb_usbvision *usbvision, unsigned char *data, int *ptr, int len) static int scratch_get_extra(struct usb_usbvision *usbvision,
unsigned char *data, int *ptr, int len)
{ {
int len_part; int len_part;
if (*ptr + len < scratch_buf_size) { if (*ptr + len < scratch_buf_size) {
@ -274,7 +276,8 @@ int scratch_get_extra(struct usb_usbvision *usbvision, unsigned char *data, int
/* This sets the scratch extra read pointer */ /* This sets the scratch extra read pointer */
void scratch_set_extra_ptr(struct usb_usbvision *usbvision, int *ptr, int len) static void scratch_set_extra_ptr(struct usb_usbvision *usbvision, int *ptr,
int len)
{ {
*ptr = (usbvision->scratch_read_ptr + len)%scratch_buf_size; *ptr = (usbvision->scratch_read_ptr + len)%scratch_buf_size;
@ -283,7 +286,7 @@ void scratch_set_extra_ptr(struct usb_usbvision *usbvision, int *ptr, int len)
/*This increments the scratch extra read pointer */ /*This increments the scratch extra read pointer */
void scratch_inc_extra_ptr(int *ptr, int len) static void scratch_inc_extra_ptr(int *ptr, int len)
{ {
*ptr = (*ptr + len) % scratch_buf_size; *ptr = (*ptr + len) % scratch_buf_size;
@ -292,7 +295,8 @@ void scratch_inc_extra_ptr(int *ptr, int len)
/* This gets data from the buffer */ /* This gets data from the buffer */
int scratch_get(struct usb_usbvision *usbvision, unsigned char *data, int len) static int scratch_get(struct usb_usbvision *usbvision, unsigned char *data,
int len)
{ {
int len_part; int len_part;
if (usbvision->scratch_read_ptr + len < scratch_buf_size) { if (usbvision->scratch_read_ptr + len < scratch_buf_size) {
@ -318,7 +322,8 @@ int scratch_get(struct usb_usbvision *usbvision, unsigned char *data, int len)
/* This sets read pointer to next header and returns it */ /* This sets read pointer to next header and returns it */
int scratch_get_header(struct usb_usbvision *usbvision,struct usbvision_frame_header *header) static int scratch_get_header(struct usb_usbvision *usbvision,
struct usbvision_frame_header *header)
{ {
int errCode = 0; int errCode = 0;
@ -346,7 +351,7 @@ int scratch_get_header(struct usb_usbvision *usbvision,struct usbvision_frame_he
/*This removes len bytes of old data from the buffer */ /*This removes len bytes of old data from the buffer */
void scratch_rm_old(struct usb_usbvision *usbvision, int len) static void scratch_rm_old(struct usb_usbvision *usbvision, int len)
{ {
usbvision->scratch_read_ptr += len; usbvision->scratch_read_ptr += len;
@ -356,7 +361,7 @@ void scratch_rm_old(struct usb_usbvision *usbvision, int len)
/*This resets the buffer - kills all data in it too */ /*This resets the buffer - kills all data in it too */
void scratch_reset(struct usb_usbvision *usbvision) static void scratch_reset(struct usb_usbvision *usbvision)
{ {
PDEBUG(DBG_SCRATCH, "\n"); PDEBUG(DBG_SCRATCH, "\n");
@ -399,8 +404,8 @@ void usbvision_scratch_free(struct usb_usbvision *usbvision)
* 1: Draw a colored grid * 1: Draw a colored grid
* *
*/ */
void usbvision_testpattern(struct usb_usbvision *usbvision, int fullframe, static void usbvision_testpattern(struct usb_usbvision *usbvision,
int pmode) int fullframe, int pmode)
{ {
static const char proc[] = "usbvision_testpattern"; static const char proc[] = "usbvision_testpattern";
struct usbvision_frame *frame; struct usbvision_frame *frame;

5
drivers/media/video/usbvision/usbvision-i2c.c
View File

@ -213,7 +213,7 @@ static struct i2c_algorithm i2c_usb_algo = {
/* /*
* registering functions to load algorithms at runtime * registering functions to load algorithms at runtime
*/ */
int usbvision_i2c_usb_add_bus(struct i2c_adapter *adap) static int usbvision_i2c_usb_add_bus(struct i2c_adapter *adap)
{ {
PDEBUG(DBG_I2C, "I2C debugging is enabled [i2c]"); PDEBUG(DBG_I2C, "I2C debugging is enabled [i2c]");
PDEBUG(DBG_ALGO, "ALGO debugging is enabled [i2c]"); PDEBUG(DBG_ALGO, "ALGO debugging is enabled [i2c]");
@ -559,9 +559,6 @@ static struct i2c_client i2c_client_template = {
.name = "usbvision internal", .name = "usbvision internal",
}; };
EXPORT_SYMBOL(usbvision_i2c_usb_add_bus);
EXPORT_SYMBOL(usbvision_i2c_usb_del_bus);
/* /*
* Overrides for Emacs so that we follow Linus's tabbing style. * Overrides for Emacs so that we follow Linus's tabbing style.
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------

2
drivers/media/video/usbvision/usbvision-video.c
View File

@ -1884,7 +1884,7 @@ static struct usb_driver usbvision_driver = {
* This procedure preprocesses CustomDevice parameter if any * This procedure preprocesses CustomDevice parameter if any
* *
*/ */
void customdevice_process(void) static void customdevice_process(void)
{ {
usbvision_device_data[0]=usbvision_device_data[1]; usbvision_device_data[0]=usbvision_device_data[1];
usbvision_table[0]=usbvision_table[1]; usbvision_table[0]=usbvision_table[1];

2
drivers/media/video/usbvision/usbvision.h
View File

@ -489,7 +489,6 @@ struct usb_usbvision {
/* i2c-algo-usb declaration */ /* i2c-algo-usb declaration */
/* --------------------------------------------------------------- */ /* --------------------------------------------------------------- */
int usbvision_i2c_usb_add_bus(struct i2c_adapter *);
int usbvision_i2c_usb_del_bus(struct i2c_adapter *); int usbvision_i2c_usb_del_bus(struct i2c_adapter *);
static inline void *i2c_get_algo_usb_data (struct i2c_algo_usb_data *dev) static inline void *i2c_get_algo_usb_data (struct i2c_algo_usb_data *dev)
@ -510,7 +509,6 @@ int usbvision_init_i2c(struct usb_usbvision *usbvision);
void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,void *arg); void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,void *arg);
/* defined in usbvision-core.c */ /* defined in usbvision-core.c */
void *usbvision_rvmalloc(unsigned long size);
void usbvision_rvfree(void *mem, unsigned long size); void usbvision_rvfree(void *mem, unsigned long size);
int usbvision_read_reg(struct usb_usbvision *usbvision, unsigned char reg); int usbvision_read_reg(struct usb_usbvision *usbvision, unsigned char reg);
int usbvision_write_reg(struct usb_usbvision *usbvision, unsigned char reg, int usbvision_write_reg(struct usb_usbvision *usbvision, unsigned char reg,