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

• Lines: 40
• Date: Wed Oct 18 05:33:26 1995
• Orig file: v1.3.35/linux/drivers/sound/patmgr.c
• Orig date: Fri Oct 13 14:44:34 1995

diff -u --recursive --new-file v1.3.35/linux/drivers/sound/patmgr.c linux/drivers/sound/patmgr.c
@@ -136,7 +136,7 @@
 
       if (mbox[dev] && msg_direction[dev] == A_TO_S)
 	{
-	  memcpy_tofs (&((buf)[0]), ((char *) mbox[dev]), (count));
+	  memcpy_tofs (&((buf)[0]), (char *) mbox[dev], count);
 	  msg_direction[dev] = 0;
 	  ok = 1;
 	}
@@ -161,7 +161,7 @@
       return -EIO;
     }
 
-  memcpy_fromfs ((mbox[dev]), &((buf)[0]), (4));
+  memcpy_fromfs (mbox[dev], &((buf)[0]), 4);
 
   if (*(unsigned char *) mbox[dev] == SEQ_FULLSIZE)
     {
@@ -191,7 +191,7 @@
 
   if (mbox[dev] && !msg_direction[dev])
     {
-      memcpy_fromfs ((&((char *) mbox[dev])[4]), &((buf)[4]), (count - 4));
+      memcpy_fromfs (&((char *) mbox[dev])[4], &((buf)[4]), count - 4);
       msg_direction[dev] = S_TO_A;
 
       if ((appl_wait_flag.mode & WK_SLEEP))
@@ -292,11 +292,7 @@
   else
     {
       if ((mbox[dev] =
-	   (struct patmgr_info *) (
-				    {
-	caddr_t x; x = kmalloc (sizeof (struct patmgr_info), GFP_KERNEL); x;
-				    }
-	   )) == NULL)
+	   (struct patmgr_info *) kmalloc (sizeof (struct patmgr_info), GFP_KERNEL)) == NULL)
 	{
 	  printk ("pmgr: Couldn't allocate memory for a message\n");
 	  return 0;