Re: [PATCH 1/6] Toshiba driver cleanup
From: Dmitry Torokhov
Date: Thu Apr 28 2005 - 00:01:37 EST
On Wednesday 27 April 2005 08:42, Dmitry Torokhov wrote:
> On 4/27/05, Andrew Morton <akpm@xxxxxxxx> wrote:
> > Dmitry Torokhov <dtor_core@xxxxxxxxxxxxx> wrote:
> > >
> > > Toshiba legacy driver cleanup:
> >
> > --- 25/drivers/char/toshiba.c~toshiba-driver-cleanup-fix 2005-04-27 00:32:47.306512192 -0700
> > +++ 25-akpm/drivers/char/toshiba.c 2005-04-27 00:32:51.521871360 -0700
> > @@ -79,7 +79,7 @@ MODULE_DESCRIPTION("Toshiba laptop SMM d
> > MODULE_SUPPORTED_DEVICE("toshiba");
> >
> > static int tosh_fn;
> > -module_param(fn, int, 0);
> > +module_param(tosh_fn, int, 0);
> > MODULE_PARM_DESC(tosh_fn, "User specified Fn key detection port");
> >
>
> Ahem, sorry, somehow picked up bad version... It was supposed to be
> module_param_named(). I will send an updated patch tonight.
>
Ok, this is the right one. Parameter is changed to "toshiba.fn" and
documented in kernel-parameters.txt
--
Dmitry
===================================================================
Toshiba legacy driver cleanup:
- use module_init/module_exit for initialization instead of using
#ifdef MODULE and calling tosh_init manually from drivers/char/misc.c
- do not explicitly initialize static variables
- some whitespace and formatting cleanups
- rename module parameter tosh_fn to toshiba.fn and document in
kernel-parameters.txt
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
---
Documentation/kernel-parameters.txt | 5 ++
drivers/char/misc.c | 4 --
drivers/char/toshiba.c | 62 ++++++++++++++----------------------
3 files changed, 30 insertions(+), 41 deletions(-)
Index: dtor/drivers/char/toshiba.c
===================================================================
--- dtor.orig/drivers/char/toshiba.c
+++ dtor/drivers/char/toshiba.c
@@ -73,16 +73,20 @@
#define TOSH_MINOR_DEV 181
-static int tosh_id = 0x0000;
-static int tosh_bios = 0x0000;
-static int tosh_date = 0x0000;
-static int tosh_sci = 0x0000;
-static int tosh_fan = 0;
-
-static int tosh_fn = 0;
-
-module_param(tosh_fn, int, 0);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jonathan Buzzard <jonathan@xxxxxxxxxxxxxx>");
+MODULE_DESCRIPTION("Toshiba laptop SMM driver");
+MODULE_SUPPORTED_DEVICE("toshiba");
+static int tosh_fn;
+module_param_named(fn, tosh_fn, int, 0);
+MODULE_PARM_DESC(fn, "User specified Fn key detection port");
+
+static int tosh_id;
+static int tosh_bios;
+static int tosh_date;
+static int tosh_sci;
+static int tosh_fan;
static int tosh_ioctl(struct inode *, struct file *, unsigned int,
unsigned long);
@@ -359,7 +363,7 @@ static int tosh_get_machine_id(void)
unsigned long address;
id = (0x100*(int) isa_readb(0xffffe))+((int) isa_readb(0xffffa));
-
+
/* do we have a SCTTable machine identication number on our hands */
if (id==0xfc2f) {
@@ -424,7 +428,7 @@ static int tosh_probe(void)
}
/* call the Toshiba SCI support check routine */
-
+
regs.eax = 0xf0f0;
regs.ebx = 0x0000;
regs.ecx = 0x0000;
@@ -440,7 +444,7 @@ static int tosh_probe(void)
/* if we get this far then we are running on a Toshiba (probably)! */
tosh_sci = regs.edx & 0xffff;
-
+
/* next get the machine ID of the current laptop */
tosh_id = tosh_get_machine_id();
@@ -475,16 +479,15 @@ static int tosh_probe(void)
return 0;
}
-int __init tosh_init(void)
+static int __init toshiba_init(void)
{
int retval;
/* are we running on a Toshiba laptop */
- if (tosh_probe()!=0)
- return -EIO;
+ if (tosh_probe())
+ return -ENODEV;
- printk(KERN_INFO "Toshiba System Managment Mode driver v"
- TOSH_VERSION"\n");
+ printk(KERN_INFO "Toshiba System Managment Mode driver v" TOSH_VERSION "\n");
/* set the port to use for Fn status if not specified as a parameter */
if (tosh_fn==0x00)
@@ -492,12 +495,12 @@ int __init tosh_init(void)
/* register the device file */
retval = misc_register(&tosh_device);
- if(retval < 0)
+ if (retval < 0)
return retval;
#ifdef CONFIG_PROC_FS
/* register the proc entry */
- if(create_proc_info_entry("toshiba", 0, NULL, tosh_get_info) == NULL){
+ if (create_proc_info_entry("toshiba", 0, NULL, tosh_get_info) == NULL) {
misc_deregister(&tosh_device);
return -ENOMEM;
}
@@ -506,27 +509,12 @@ int __init tosh_init(void)
return 0;
}
-#ifdef MODULE
-int init_module(void)
+static void __exit toshiba_exit(void)
{
- return tosh_init();
-}
-
-void cleanup_module(void)
-{
- /* remove the proc entry */
-
remove_proc_entry("toshiba", NULL);
-
- /* unregister the device file */
-
misc_deregister(&tosh_device);
}
-#endif
-MODULE_LICENSE("GPL");
-MODULE_PARM_DESC(tosh_fn, "User specified Fn key detection port");
-MODULE_AUTHOR("Jonathan Buzzard <jonathan@xxxxxxxxxxxxxx>");
-MODULE_DESCRIPTION("Toshiba laptop SMM driver");
-MODULE_SUPPORTED_DEVICE("toshiba");
+module_init(toshiba_init);
+module_exit(toshiba_exit);
Index: dtor/drivers/char/misc.c
===================================================================
--- dtor.orig/drivers/char/misc.c
+++ dtor/drivers/char/misc.c
@@ -66,7 +66,6 @@ static unsigned char misc_minors[DYNAMIC
extern int rtc_DP8570A_init(void);
extern int rtc_MK48T08_init(void);
extern int pmu_device_init(void);
-extern int tosh_init(void);
extern int i8k_init(void);
#ifdef CONFIG_PROC_FS
@@ -314,9 +313,6 @@ static int __init misc_init(void)
#ifdef CONFIG_PMAC_PBOOK
pmu_device_init();
#endif
-#ifdef CONFIG_TOSHIBA
- tosh_init();
-#endif
#ifdef CONFIG_I8K
i8k_init();
#endif
Index: dtor/Documentation/kernel-parameters.txt
===================================================================
--- dtor.orig/Documentation/kernel-parameters.txt
+++ dtor/Documentation/kernel-parameters.txt
@@ -1427,6 +1427,11 @@ running once the system is up.
See comment before function dc390_setup() in
drivers/scsi/tmscsim.c.
+ toshiba.fn= [HW] Specifies port Toshiba laptop SMM driver should
+ use to read status of Fn key. 0 (default value) tells
+ the driver to automatically select appropriate port
+ depending on the model of the laptop.
+
tp720= [HW,PS2]
trix= [HW,OSS] MediaTrix AudioTrix Pro
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/