Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

irda: use msecs_to_jiffies for conversions

This is only an API consolidation and should make things more readable
it replaces var * HZ / 1000 constructs by msecs_to_jiffies(var).

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Nicholas Mc Guire and committed by
David S. Miller
a994a090 9d6dbe1b

+5 -3
+5 -3
net/irda/irlap.c
··· 533 533 info.discovery = discovery; 534 534 535 535 /* sysctl_slot_timeout bounds are checked in irsysctl.c - Jean II */ 536 - self->slot_timeout = sysctl_slot_timeout * HZ / 1000; 536 + self->slot_timeout = msecs_to_jiffies(sysctl_slot_timeout); 537 537 538 538 irlap_do_event(self, DISCOVERY_REQUEST, NULL, &info); 539 539 } ··· 1015 1015 * Or, this is how much we can keep the pf bit in primary mode. 1016 1016 * Therefore, it must be lower or equal than our *OWN* max turn around. 1017 1017 * Jean II */ 1018 - self->poll_timeout = self->qos_tx.max_turn_time.value * HZ / 1000; 1018 + self->poll_timeout = msecs_to_jiffies( 1019 + self->qos_tx.max_turn_time.value); 1019 1020 /* The Final timeout applies only to the primary station. 1020 1021 * It defines the maximum time the primary wait (mostly in RECV mode) 1021 1022 * for an answer from the secondary station before polling it again. 1022 1023 * Therefore, it must be greater or equal than our *PARTNER* 1023 1024 * max turn around time - Jean II */ 1024 - self->final_timeout = self->qos_rx.max_turn_time.value * HZ / 1000; 1025 + self->final_timeout = msecs_to_jiffies( 1026 + self->qos_rx.max_turn_time.value); 1025 1027 /* The Watchdog Bit timeout applies only to the secondary station. 1026 1028 * It defines the maximum time the secondary wait (mostly in RECV mode) 1027 1029 * for poll from the primary station before getting annoyed.