patch-2.4.7 linux/drivers/ieee1394/csr.c

• Lines: 57
• Date: Thu Jul 19 17:48:15 2001
• Orig file: v2.4.6/linux/drivers/ieee1394/csr.c
• Orig date: Thu Mar 1 16:57:11 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/ieee1394/csr.c linux/drivers/ieee1394/csr.c
@@ -118,9 +118,8 @@
         int oldcycle;
         quadlet_t ret;
         
-        if ((csraddr | length) & 0x3) {
+        if ((csraddr | length) & 0x3)
                 return RCODE_TYPE_ERROR;
-        }
 
         length /= 4;
 
@@ -222,14 +221,13 @@
         return RCODE_COMPLETE;
 }
 
-static int write_regs(struct hpsb_host *host, int nodeid, quadlet_t *data,
-                      u64 addr, unsigned int length)
+static int write_regs(struct hpsb_host *host, int nodeid, int destid,
+		      quadlet_t *data, u64 addr, unsigned int length)
 {
         int csraddr = addr - CSR_REGISTER_BASE;
         
-        if ((csraddr | length) & 0x3) {
+        if ((csraddr | length) & 0x3)
                 return RCODE_TYPE_ERROR;
-        }
 
         length /= 4;
 
@@ -310,7 +308,8 @@
         unsigned long flags;
         quadlet_t *regptr = NULL;
 
-        if (csraddr & 0x3) return RCODE_TYPE_ERROR;
+        if (csraddr & 0x3)
+		return RCODE_TYPE_ERROR;
 
         if (csraddr < CSR_BUS_MANAGER_ID || csraddr > CSR_CHANNELS_AVAILABLE_LO
             || extcode != EXTCODE_COMPARE_SWAP)
@@ -379,14 +378,13 @@
         }
 }
 
-static int write_fcp(struct hpsb_host *host, int nodeid, quadlet_t *data,
-                     u64 addr, unsigned int length)
+static int write_fcp(struct hpsb_host *host, int nodeid, int dest,
+		     quadlet_t *data, u64 addr, unsigned int length)
 {
         int csraddr = addr - CSR_REGISTER_BASE;
 
-        if (length > 512) {
+        if (length > 512)
                 return RCODE_TYPE_ERROR;
-        }
 
         switch (csraddr) {
         case CSR_FCP_COMMAND: