patch-1.3.36 linux/drivers/sound/pss.c

Next file: linux/drivers/sound/sb16_dsp.c
Previous file: linux/drivers/sound/patmgr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.35/linux/drivers/sound/pss.c linux/drivers/sound/pss.c
@@ -510,17 +510,11 @@
 	copr_buffer    *buf;
 	int             err;
 
-	buf = (copr_buffer *) (
-				{
-				caddr_t x;
-			     x = kmalloc (sizeof (copr_buffer), GFP_KERNEL);
-				x;
-				}
-	);
+	buf = (copr_buffer *) kmalloc (sizeof (copr_buffer), GFP_KERNEL);
 	if (buf == NULL)
 	  return -ENOSPC;
 
-	memcpy_fromfs (((char *) buf), &(((char *) arg)[0]), (sizeof (*buf)));
+	memcpy_fromfs ((char *) buf, &(((char *) arg)[0]), sizeof (*buf));
 	err = download_boot_block (dev_info, buf);
 	kfree (buf);
 	return err;
@@ -533,7 +527,7 @@
 	unsigned long   flags;
 	unsigned short  tmp;
 
-	memcpy_fromfs (((char *) &buf), &(((char *) arg)[0]), (sizeof (buf)));
+	memcpy_fromfs ((char *) &buf, &(((char *) arg)[0]), sizeof (buf));
 
 	save_flags (flags);
 	cli ();
@@ -558,7 +552,7 @@
 	buf.parm1 = tmp;
 	restore_flags (flags);
 
-	memcpy_tofs (&(((char *) arg)[0]), (&buf), (sizeof (buf)));
+	memcpy_tofs ((&((char *) arg)[0]), &buf, sizeof (buf));
 	return 0;
       }
       break;
@@ -569,7 +563,7 @@
 	unsigned long   flags;
 	unsigned short  tmp;
 
-	memcpy_fromfs (((char *) &buf), &(((char *) arg)[0]), (sizeof (buf)));
+	memcpy_fromfs ((char *) &buf, &(((char *) arg)[0]), sizeof (buf));
 
 	save_flags (flags);
 	cli ();
@@ -603,7 +597,7 @@
 	unsigned long   flags;
 	unsigned short  tmp;
 
-	memcpy_fromfs (((char *) &buf), &(((char *) arg)[0]), (sizeof (buf)));
+	memcpy_fromfs ((char *) &buf, &(((char *) arg)[0]), sizeof (buf));
 
 	save_flags (flags);
 	cli ();
@@ -644,7 +638,7 @@
 	unsigned long   flags;
 	unsigned short  tmp;
 
-	memcpy_fromfs (((char *) &buf), &(((char *) arg)[0]), (sizeof (buf)));
+	memcpy_fromfs ((char *) &buf, &(((char *) arg)[0]), sizeof (buf));
 
 	save_flags (flags);
 	cli ();
@@ -678,7 +672,7 @@
 
 	restore_flags (flags);
 
-	memcpy_tofs (&(((char *) arg)[0]), (&buf), (sizeof (buf)));
+	memcpy_tofs ((&((char *) arg)[0]), &buf, sizeof (buf));
 	return 0;
       }
       break;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this