Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

V4L/DVB (3399a): cpia2/cpia2_v4l.c cleanups

- make 2 needlessly global functions static

- remove cpia2_setup(): the driver already allows setting parameters
through module_param(), and there's no reason for having two different
ways for setting the same parameters

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

authored by

Adrian Bunk and committed by
Mauro Carvalho Chehab
8cbe84f3 d15549ac

+3 -28
+1 -1
Documentation/video4linux/README.cpia2
··· 70 70 71 71 If the driver is compiled into the kernel, at boot time specify them 72 72 like this: 73 - cpia2=num_buffers:3,buffer_size:65535 73 + cpia2.num_buffers=3 cpia2.buffer_size=65535 74 74 75 75 What buffer size should I use? 76 76 ------------------------------
+2 -27
drivers/media/video/cpia2/cpia2_v4l.c
··· 2053 2053 * cpia2_init/module_init 2054 2054 * 2055 2055 *****************************************************************************/ 2056 - int __init cpia2_init(void) 2056 + static int __init cpia2_init(void) 2057 2057 { 2058 2058 LOG("%s v%d.%d.%d\n", 2059 2059 ABOUT, CPIA2_MAJ_VER, CPIA2_MIN_VER, CPIA2_PATCH_VER); ··· 2068 2068 * cpia2_exit/module_exit 2069 2069 * 2070 2070 *****************************************************************************/ 2071 - void __exit cpia2_exit(void) 2071 + static void __exit cpia2_exit(void) 2072 2072 { 2073 2073 cpia2_usb_cleanup(); 2074 2074 schedule_timeout(2 * HZ); 2075 2075 } 2076 - 2077 - 2078 - int __init cpia2_setup(char *str) 2079 - { 2080 - while(str) { 2081 - if(!strncmp(str, "buffer_size:", 12)) { 2082 - buffer_size = simple_strtoul(str + 13, &str, 10); 2083 - } else if(!strncmp(str, "num_buffers:", 12)) { 2084 - num_buffers = simple_strtoul(str + 13, &str, 10); 2085 - } else if(!strncmp(str, "alternate:", 10)) { 2086 - alternate = simple_strtoul(str + 11, &str, 10); 2087 - } else if(!strncmp(str, "video_nr:", 9)) { 2088 - video_nr = simple_strtoul(str + 10, &str, 10); 2089 - } else if(!strncmp(str, "flicker_freq:",13)) { 2090 - flicker_freq = simple_strtoul(str + 14, &str, 10); 2091 - } else if(!strncmp(str, "flicker_mode:",13)) { 2092 - flicker_mode = simple_strtoul(str + 14, &str, 10); 2093 - } else { 2094 - ++str; 2095 - } 2096 - } 2097 - return 1; 2098 - } 2099 - 2100 - __setup("cpia2=", cpia2_setup); 2101 2076 2102 2077 module_init(cpia2_init); 2103 2078 module_exit(cpia2_exit);