X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Ftoshiba.c;h=58e21fe4426243f721001637a6d57f6f6ced7d6e;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=15e2c72ed087856d343457208a57ca359b9558a1;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 15e2c72ed..58e21fe44 100644
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -81,7 +81,7 @@ static int tosh_fan = 0;
 
 static int tosh_fn = 0;
 
-MODULE_PARM(tosh_fn, "i");
+module_param(tosh_fn, int, 0);
 
 
 static int tosh_ioctl(struct inode *, struct file *, unsigned int,
@@ -251,13 +251,14 @@ static int tosh_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
 	unsigned long arg)
 {
 	SMMRegisters regs;
+	SMMRegisters __user *argp = (SMMRegisters __user *)arg;
 	unsigned short ax,bx;
 	int err;
 
-	if (!arg)
+	if (!argp)
 		return -EINVAL;
 
-	if (copy_from_user(&regs, (SMMRegisters *) arg, sizeof(SMMRegisters)))
+	if (copy_from_user(&regs, argp, sizeof(SMMRegisters)))
 		return -EFAULT;
 
 	switch (cmd) {
@@ -281,7 +282,7 @@ static int tosh_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
 			return -EINVAL;
 	}
 
-        if (copy_to_user((SMMRegisters *) arg, &regs, sizeof(SMMRegisters)))
+        if (copy_to_user(argp, &regs, sizeof(SMMRegisters)))
         	return -EFAULT;
 
 	return (err==0) ? 0:-EINVAL;
@@ -406,7 +407,7 @@ static int tosh_get_machine_id(void)
  *   laptop, otherwise zero and determines the Machine ID, BIOS version and
  *   date, and SCI version.
  */
-int tosh_probe(void)
+static int tosh_probe(void)
 {
 	int i,major,minor,day,year,month,flag;
 	unsigned char signature[7] = { 0x54,0x4f,0x53,0x48,0x49,0x42,0x41 };