Date: Sun, 8 Oct 2006 11:45:13 +0200 (CEST)
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Subject: ieee1394: usecs_to_jiffies takes unsigned int argument

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
The constants could be written as 1000000U etc. but I followed the style
used in all other unsigned int expressions in csr.c.

Index: linux/drivers/ieee1394/csr.c
===================================================================
--- linux.orig/drivers/ieee1394/csr.c	2006-10-06 20:34:45.000000000 +0200
+++ linux/drivers/ieee1394/csr.c	2006-10-08 11:21:02.000000000 +0200
@@ -158,12 +158,10 @@ static void host_reset(struct hpsb_host 
  */
 static inline void calculate_expire(struct csr_control *csr)
 {
-	unsigned long usecs =
-		(csr->split_timeout_hi & 0x07) * USEC_PER_SEC +
-		(csr->split_timeout_lo >> 19) * 125L;
-
-	csr->expire = usecs_to_jiffies(usecs > 100000L ? usecs : 100000L);
+	unsigned int usecs = (csr->split_timeout_hi & 7) * 1000000 +
+			     (csr->split_timeout_lo >> 19) * 125;
 
+	csr->expire = usecs_to_jiffies(usecs > 100000 ? usecs : 100000);
 	HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ);
 }