diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-06-30 04:56:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 14:25:38 -0400 |
commit | 7adc28ae75854d9d0940668404a14d1f006f80c0 (patch) | |
tree | 57a18511f071706c79145364eaae0969bf2b750d /drivers/cdrom/cm206.c | |
parent | 7b2baa1f8a82d0940db6fbbaa00e5b829a99b2c9 (diff) |
[PATCH] drivers/cdrom/cm206.c: cleanups
- make __cm206_init() __init (required since it calls
the __init cm206_init())
- make the needlessly global bcdbin() static
- remove a comment with an obsolete compile command
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/cdrom/cm206.c')
-rw-r--r-- | drivers/cdrom/cm206.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index 4ee288688fe..9b05ddd2314 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c | |||
@@ -914,7 +914,7 @@ static void seek(int lba) | |||
914 | cd->dsb = wait_dsb(); | 914 | cd->dsb = wait_dsb(); |
915 | } | 915 | } |
916 | 916 | ||
917 | uch bcdbin(unsigned char bcd) | 917 | static uch bcdbin(unsigned char bcd) |
918 | { /* stolen from mcd.c! */ | 918 | { /* stolen from mcd.c! */ |
919 | return (bcd >> 4) * 10 + (bcd & 0xf); | 919 | return (bcd >> 4) * 10 + (bcd & 0xf); |
920 | } | 920 | } |
@@ -1532,7 +1532,7 @@ static void __init parse_options(void) | |||
1532 | } | 1532 | } |
1533 | } | 1533 | } |
1534 | 1534 | ||
1535 | static int __cm206_init(void) | 1535 | static int __init __cm206_init(void) |
1536 | { | 1536 | { |
1537 | parse_options(); | 1537 | parse_options(); |
1538 | #if !defined(AUTO_PROBE_MODULE) | 1538 | #if !defined(AUTO_PROBE_MODULE) |
@@ -1593,8 +1593,3 @@ __setup("cm206=", cm206_setup); | |||
1593 | #endif /* !MODULE */ | 1593 | #endif /* !MODULE */ |
1594 | MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR); | 1594 | MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR); |
1595 | 1595 | ||
1596 | /* | ||
1597 | * Local variables: | ||
1598 | * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -DMODULE -DMODVERSIONS -include /usr/src/linux/include/linux/modversions.h -c -o cm206.o cm206.c" | ||
1599 | * End: | ||
1600 | */ | ||