tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ieee1394: usecs_to_jiffies takes unsigned int argument
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
+3
-5
+3
-5
drivers/ieee1394/csr.c
+3
-5
drivers/ieee1394/csr.c
···
158
158
*/
159
159
static inline void calculate_expire(struct csr_control *csr)
160
160
{
161
-
unsigned long usecs =
162
-
(csr->split_timeout_hi & 0x07) * USEC_PER_SEC +
163
-
(csr->split_timeout_lo >> 19) * 125L;
161
+
unsigned int usecs = (csr->split_timeout_hi & 7) * 1000000 +
162
+
(csr->split_timeout_lo >> 19) * 125;
164
163
165
-
csr->expire = usecs_to_jiffies(usecs > 100000L ? usecs : 100000L);
166
-
164
+
csr->expire = usecs_to_jiffies(usecs > 100000 ? usecs : 100000);
167
165
HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ);
168
166
}
169
167