Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f7e9473 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Greg Kroah-Hartman
Browse files

USB: legotower: use msecs_to_jiffies for time conversion 



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

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9751afbb

drivers/usb/misc/legousbtower.c

+3 −3
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static ssize_t tower_read (struct file *file, char __user *buffer, size_t count, 
	}



	if (read_timeout) {

		timeout = jiffies + read_timeout * HZ / 1000;

		timeout = jiffies + msecs_to_jiffies(read_timeout);

	}



	/* wait for data */
@@ -592,7 +592,7 @@ static ssize_t tower_read (struct file *file, char __user *buffer, size_t count, 
		/* reset read timeout during read or write activity */

		if (read_timeout

		    && (dev->read_buffer_length || dev->interrupt_out_busy)) {

			timeout = jiffies + read_timeout * HZ / 1000;

			timeout = jiffies + msecs_to_jiffies(read_timeout);

		}

		/* check for read timeout */

		if (read_timeout && time_after (jiffies, timeout)) {
@@ -831,7 +831,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device 
	dev->read_buffer_length = 0;

	dev->read_packet_length = 0;

	spin_lock_init (&dev->read_buffer_lock);

	dev->packet_timeout_jiffies = packet_timeout * HZ / 1000;

	dev->packet_timeout_jiffies = msecs_to_jiffies(packet_timeout);

	dev->read_last_arrival = jiffies;



	init_waitqueue_head (&dev->read_wait);