From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>,
scottbertin@yahoo.com, Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-kernel@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@infradead.org>
Subject: [-mm patch] drivers/media/video/cpia2/cpia2_v4l.c cleanups
Date: Sat, 25 Feb 2006 14:15:29 +0100 [thread overview]
Message-ID: <20060225131529.GL3674@stusta.de> (raw)
In-Reply-To: <20060224031002.0f7ff92a.akpm@osdl.org>
On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.16-rc4-mm1:
>...
> +add-cpia2-camera-support.patch
>
> CPIA camera driver
This patch contains the following 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>
---
Documentation/video4linux/README.cpia2 | 2 -
drivers/media/video/cpia2/cpia2_v4l.c | 29 +------------------------
2 files changed, 3 insertions(+), 28 deletions(-)
--- linux-2.6.16-rc4-mm2-full/Documentation/video4linux/README.cpia2.old 2006-02-25 05:00:43.000000000 +0100
+++ linux-2.6.16-rc4-mm2-full/Documentation/video4linux/README.cpia2 2006-02-25 05:01:30.000000000 +0100
@@ -70,7 +70,7 @@
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?
------------------------------
--- linux-2.6.16-rc4-mm2-full/drivers/media/video/cpia2/cpia2_v4l.c.old 2006-02-25 05:02:17.000000000 +0100
+++ linux-2.6.16-rc4-mm2-full/drivers/media/video/cpia2/cpia2_v4l.c 2006-02-25 05:38:03.000000000 +0100
@@ -2054,7 +2054,7 @@
* 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);
@@ -2069,37 +2069,12 @@
* 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);
next prev parent reply other threads:[~2006-02-25 13:15 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton
2006-02-24 16:27 ` [-mm PATCH] mips: fixed collision of rtc function name Yoichi Yuasa
2006-02-25 13:48 ` Atsushi Nemoto
2006-02-26 22:43 ` Yoichi Yuasa
2006-03-06 21:12 ` Ralf Baechle
2006-02-24 23:52 ` 2.6.16-rc4-mm2 Sam Ravnborg
2006-02-25 3:31 ` 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation Adrian Bunk
2006-02-25 4:46 ` Alessandro Zummo
2006-02-25 13:10 ` Adrian Bunk
2006-02-26 18:41 ` Alessandro Zummo
2006-02-26 18:55 ` Adrian Bunk
2006-02-26 20:02 ` Russell King
2006-03-03 22:26 ` Adrian Bunk
2006-02-25 3:38 ` 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error Adrian Bunk
2006-02-25 7:10 ` Rusty Russell
2006-02-25 7:22 ` Andrew Morton
2006-02-25 7:56 ` Rusty Russell
2006-02-25 3:47 ` oss/sonicvibes.c defines its own hweight32 Richard Knutsson
2006-02-25 4:11 ` 2.6.16-rc4-mm2: useless acpi_pmtmr_buggy Adrian Bunk
2006-02-25 11:59 ` 2.6.16-rc4-mm2 Jesper Juhl
2006-02-25 12:17 ` 2.6.16-rc4-mm2 Andrew Morton
2006-02-25 12:25 ` 2.6.16-rc4-mm2 Jesper Juhl
2006-02-25 12:31 ` 2.6.16-rc4-mm2 Andrew Morton
2006-02-25 12:41 ` 2.6.16-rc4-mm2 Jesper Juhl
2006-02-25 15:51 ` 2.6.16-rc4-mm2 Jesper Juhl
2006-02-26 23:38 ` 2.6.16-rc4-mm2 Antonino A. Daplas
2006-02-25 13:15 ` Adrian Bunk [this message]
2006-02-25 13:18 ` [-mm patch] kernel/params.c: make param_array() static Adrian Bunk
2006-02-25 13:21 ` [-mm patch] drivers/rtc/: make some structs static Adrian Bunk
2006-02-25 13:24 ` [-mm patch] kernel/fork.c: make signal_cachep static Adrian Bunk
2006-02-25 13:27 ` [-mm patch] net/dccp/ipv4.c: make struct dccp_v4_prot static Adrian Bunk
2006-02-25 14:31 ` Arnaldo Carvalho de Melo
2006-02-25 13:45 ` usbfs2 panic [Was: 2.6.16-rc4-mm2] Jiri Slaby
2006-02-25 18:05 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060225131529.GL3674@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=scottbertin@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).