usbvision: possible cleanups
PATCH 1/1 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 <[email protected]>
---
drivers/media/video/usbvision/usbvision-core.c | 33 +++++++++------- drivers/media/video/usbvision/usbvision-i2c.c | 5 -- drivers/media/video/usbvision/usbvision-video.c | 2 drivers/media/video/usbvision/usbvision.h | 2 4 files changed, 21 insertions(+), 21 deletions(-)
drivers/media/video/usbvision/usbvision-core.c renamed from drivers/media/video/usbvision/usbvision-core.c.old +19 -14
@@ -118,7 +118,7 @@* 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;unsigned long adr;
@@ -181,7 +181,7 @@/******************************** * 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;if (len <0 ) {
@@ -194,7 +194,7 @@/* 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;if (free <=0 ) {
@@ -211,7 +211,8 @@/* 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;
@@ -237,7 +238,7 @@ }/* 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);
@@ -248,7 +249,8 @@ }/* 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;if (*ptr + len < scratch_buf_size) {
@@ -274,7 +276,8 @@/* 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;
@@ -283,7 +286,7 @@/*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;
@@ -292,7 +295,8 @@/* 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;if (usbvision->scratch_read_ptr + len < scratch_buf_size) {
@@ -318,7 +322,8 @@/* 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 ;
@@ -346,7 +351,7 @@/*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;
@@ -356,7 +361,7 @@/*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" );
@@ -399,8 +404,8 @@* 1: Draw a colored grid * */ -void usbvision_testpattern (struct usb_usbvision *usbvision,int fullframe, -int pmode) +static void usbvision_testpattern (struct usb_usbvision *usbvision, +int fullframe,int pmode) {static const char proc[] ="usbvision_testpattern" ;struct usbvision_frame *frame;
drivers/media/video/usbvision/usbvision.h renamed from drivers/media/video/usbvision/usbvision.h.old +0 -2
@@ -489,7 +489,6 @@/* i2c-algo-usb declaration */ /* --------------------------------------------------------------- */ -int usbvision_i2c_usb_add_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)
@@ -510,7 +509,6 @@void call_i2c_clients (struct usb_usbvision *usbvision,unsigned int cmd,void *arg);/* defined in usbvision-core.c */ -void *usbvision_rvmalloc (unsigned long size);void usbvision_rvfree (void *mem,unsigned long size);int usbvision_read_reg (struct usb_usbvision *usbvision,unsigned char reg); int usbvision_write_reg(struct usb_usbvision *usbvision, unsigned char reg,
drivers/media/video/usbvision/usbvision-i2c.c renamed from drivers/media/video/usbvision/usbvision-i2c.c.old +1 -4
@@ -209,7 +209,7 @@/* * 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_ALGO ,"ALGO debugging is enabled [i2c]" );
@@ -555,9 +555,6 @@ .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. * ---------------------------------------------------------------------------
drivers/media/video/usbvision/usbvision-video.c renamed from drivers/media/video/usbvision/usbvision-video.c.old +1 -1
@@ -1884,7 +1884,7 @@* 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_table[0 ]=usbvision_table[1 ];
Right.
This is not a surprise, the driver still works flawlessly. Thanks
Regards,
Thierry
Quoted 5 lines · Adrian Bunk
This patch contains the following possible cleanups:
- make needlessly global functions static
- remove the unused EXPORT_SYMBOL's