[KJ] [PATCH] radio-sf16fmi cleanup

[KJ] [PATCH] radio-sf16fmi cleanup

[Marcel Sebek]

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]

This is small cleanup of radio-sf16fmi driver.

Compile tested.

Signed-off-by: Marcel Sebek <sebek64@post.cz>

diff -urNp linux-2.6/drivers/media/radio/radio-sf16fmi.c linux-2.6-new/drivers/media/radio/radio-sf16fmi.c
--- linux-2.6/drivers/media/radio/radio-sf16fmi.c	2004-09-13 19:44:54.000000000 +0200
+++ linux-2.6-new/drivers/media/radio/radio-sf16fmi.c	2004-12-18 19:15:02.000000000 +0100
@@ -22,6 +22,7 @@
 #include <linux/delay.h>	/* udelay			*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
 #include <linux/isapnp.h>
+#include <linux/moduleparam.h>
 #include <asm/io.h>		/* outb, outb_p			*/
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <asm/semaphore.h>
@@ -36,7 +37,7 @@ struct fmi_device
 
 static int io = -1; 
 static int radio_nr = -1;
-static struct pnp_dev *dev = NULL;
+static struct pnp_dev *dev;
 static struct semaphore lock;
 
 /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */
@@ -312,9 +313,9 @@ MODULE_AUTHOR("Petr Vandrovec, vandrove@
 MODULE_DESCRIPTION("A driver for the SF16MI radio.");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM(io, "i");
+module_param(io, int, 0444);
 MODULE_PARM_DESC(io, "I/O address of the SF16MI card (0x284 or 0x384)");
-MODULE_PARM(radio_nr, "i");
+module_param(radio_nr, int, 0444);
 
 static void __exit fmi_cleanup_module(void)
 {
@@ -326,13 +327,3 @@ static void __exit fmi_cleanup_module(vo
 
 module_init(fmi_init);
 module_exit(fmi_cleanup_module);
-
-#ifndef MODULE
-static int __init fmi_setup_io(char *str)
-{
-	get_option(&str, &io);
-	return 1;
-}
-
-__setup("sf16fm=", fmi_setup_io);
-#endif


[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] radio-sf16fmi cleanup

[Domen Puncer]

[-- Attachment #1: Type: text/plain, Size: 813 bytes --]

On 19/12/04 20:05 +0100, Marcel Sebek wrote:
> This is small cleanup of radio-sf16fmi driver.
> 
> Compile tested.
> 
> Signed-off-by: Marcel Sebek <sebek64@post.cz>
> 
> diff -urNp linux-2.6/drivers/media/radio/radio-sf16fmi.c linux-2.6-new/drivers/media/radio/radio-sf16fmi.c
> --- linux-2.6/drivers/media/radio/radio-sf16fmi.c	2004-09-13 19:44:54.000000000 +0200
> +++ linux-2.6-new/drivers/media/radio/radio-sf16fmi.c	2004-12-18 19:15:02.000000000 +0100
...
> -MODULE_PARM(io, "i");
> +module_param(io, int, 0444);
...

module_param from other folks already got merged.


Care to resend this chunk with removal from kernel-parameters.txt?

> -
> -#ifndef MODULE
> -static int __init fmi_setup_io(char *str)
> -{
> -	get_option(&str, &io);
> -	return 1;
> -}
> -
> -__setup("sf16fm=", fmi_setup_io);
> -#endif

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] radio-sf16fmi cleanup

[Marcel Sebek]

[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]

On Mon, Jan 10, 2005 at 02:27:44AM +0100, Domen Puncer wrote:
> Care to resend this chunk with removal from kernel-parameters.txt?
> 
> > -
> > -#ifndef MODULE
> > -static int __init fmi_setup_io(char *str)
> > -{
> > -	get_option(&str, &io);
> > -	return 1;
> > -}
> > -
> > -__setup("sf16fm=", fmi_setup_io);
> > -#endif

Signed-off-by: Marcel Sebek <sebek64@post.cz>

Index: linux-2.6.10-kj/Documentation/kernel-parameters.txt
===================================================================
--- linux-2.6.10-kj.orig/Documentation/kernel-parameters.txt	2005-01-10 18:25:09.000000000 +0100
+++ linux-2.6.10-kj/Documentation/kernel-parameters.txt	2005-01-10 18:51:46.603823832 +0100
@@ -1134,9 +1134,6 @@ running once the system is up.
 
 	serialnumber	[BUGS=IA-32]
 
-	sf16fm=		[HW] SF16FMI radio driver for Linux
-			Format: <io>
-
 	sg_def_reserved_size=
 			[SCSI]
  
Index: linux-2.6.10-kj/drivers/media/radio/radio-sf16fmi.c
===================================================================
--- linux-2.6.10-kj.orig/drivers/media/radio/radio-sf16fmi.c	2005-01-10 18:25:18.000000000 +0100
+++ linux-2.6.10-kj/drivers/media/radio/radio-sf16fmi.c	2005-01-10 18:56:33.919054420 +0100
@@ -326,13 +326,3 @@ static void __exit fmi_cleanup_module(vo
 
 module_init(fmi_init);
 module_exit(fmi_cleanup_module);
-
-#ifndef MODULE
-static int __init fmi_setup_io(char *str)
-{
-	get_option(&str, &io);
-	return 1;
-}
-
-__setup("sf16fm=", fmi_setup_io);
-#endif


[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors