Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cbe84f3 authored by Adrian Bunk's avatar Adrian Bunk Committed by Mauro Carvalho Chehab
Browse files

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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent d15549ac

Documentation/video4linux/README.cpia2

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ line like this: 


	If the driver is compiled into the kernel, at boot time specify them

like this:

	cpia2=num_buffers:3,buffer_size:65535

	cpia2.num_buffers=3 cpia2.buffer_size=65535



	What buffer size should I use?

	------------------------------

drivers/media/video/cpia2/cpia2_v4l.c

+2 −27
Original line number Diff line number Diff line
@@ -2053,7 +2053,7 @@ static void __init check_parameters(void) 
 * cpia2_init/module_init

 *

 *****************************************************************************/

int __init cpia2_init(void)

static int __init cpia2_init(void)

{

	LOG("%s v%d.%d.%d\n",

	    ABOUT, CPIA2_MAJ_VER, CPIA2_MIN_VER, CPIA2_PATCH_VER);
@@ -2068,37 +2068,12 @@ int __init cpia2_init(void) 
 * cpia2_exit/module_exit

 *

 *****************************************************************************/

void __exit cpia2_exit(void)

static void __exit cpia2_exit(void)

{

	cpia2_usb_cleanup();

	schedule_timeout(2 * HZ);

}





int __init cpia2_setup(char *str)

{

	while(str) {

		if(!strncmp(str, "buffer_size:", 12)) {

			buffer_size = simple_strtoul(str + 13, &str, 10);

		} else if(!strncmp(str, "num_buffers:", 12)) {

			num_buffers = simple_strtoul(str + 13, &str, 10);

		} else if(!strncmp(str, "alternate:", 10)) {

			alternate = simple_strtoul(str + 11, &str, 10);

		} else if(!strncmp(str, "video_nr:", 9)) {

			video_nr = simple_strtoul(str + 10, &str, 10);

		} else if(!strncmp(str, "flicker_freq:",13)) {

		   flicker_freq = simple_strtoul(str + 14, &str, 10);

		} else if(!strncmp(str, "flicker_mode:",13)) {

		   flicker_mode = simple_strtoul(str + 14, &str, 10);

		} else {

			++str;

		}

	}

	return 1;

}



__setup("cpia2=", cpia2_setup);



module_init(cpia2_init);

module_exit(cpia2_exit);